comfortable_mexican_sofa 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe2c3b16cbc35037c12ef3e0bd63724dae6191fe
-  data.tar.gz: c480154bd6833e3af69b46e28340ee7cb9a5fb03
+  metadata.gz: d9aab08f0f25ef0f202bf5d5f6ff90c49b0cda7c
+  data.tar.gz: 517ea8d8c64e602a88397423cfd26eed61ba09ae
 SHA512:
-  metadata.gz: f5a3acbc7c9582eb759395d44b0769b934251d143fb82ffccbbeba451b5d1ebf4c5a8a154886c0c36156e27f364e789e86ab5316cb00d53d8d3c86e9f6e734f7
-  data.tar.gz: 73730d6a99596fabd4093045e0ce90f8b806ec793cb68fd3a07eacf77794043417d99ad36d49ee3fe9c4f4e1742fca4253db1394a51b8eec3116f21b3cda197f
+  metadata.gz: 18125e0be51511b721ad3d14312742a9d17db31dbb2294e6765b063b18dc735f7172adb082de34bb879c2dc793cd0d55480aa0fedb9af2e179f0138fc4845049
+  data.tar.gz: 1d9886bbaf7c798e01324a3c2bd6dd0f4e401db7a3fdd1742dbae63005ef29edd37e080ef77ede31141f5faf746a0748e06eb600986f14035b98fd908151f41c

data/config/locales/zh-CN.yml

@@ -6,7 +6,7 @@ zh-CN:
       comfy/cms/page: 页面
       comfy/cms/snippet: 片段
       comfy/cms/file: 文件
-      comfy/cms/translation: Translation
+      comfy/cms/translation: 翻译
 
     attributes:
       comfy/cms/site:
@@ -26,8 +26,8 @@ zh-CN:
       comfy/cms/page:
         label: 页面名称
         layout_id: 布局
-        slug: Slug
-        full_path: Full path
+        slug: 缩略路径
+        full_path: 完整路径
         parent_id: 上级
         target_page_id: 跳转至
         content: 内容
@@ -41,10 +41,10 @@ zh-CN:
         label: 标签
         content: 内容
       comfy/cms/translation:
-        locale: Language
-        label: Label
-        layout_id: Layout
-        is_published: Published
+        locale: 语言
+        label: 标签
+        layout_id: 布局
+        is_published: 发布
 
   comfy:
     cms:
@@ -57,7 +57,7 @@ zh-CN:
       cms:
         base:
           site_not_found: 没有该站点
-          seeds_enabled: CMS夹具已经启用，在此处的所有修改将被忽略。
+          seeds_enabled: CMS样板已经启用，在此处的所有修改将被忽略。
 
           sites: 站点
           layouts: 布局
@@ -144,7 +144,7 @@ zh-CN:
             create: 创建页面
             cancel: 取消
             update: 更新页面
-            choose_link: Select page...
+            choose_link: 选择页面...
 
         fragments:
           form_fragments:
@@ -153,25 +153,25 @@ zh-CN:
               编辑内容使其包含一个页面或者field标签。例如： <code>{{cms:wysiwyg content}}</code>
 
         translations:
-          created: Translation created
-          creation_failure: Failed to create translation
-          updated: Translation updated
-          update_failure: Failed to update translation
-          deleted: Translation deleted
-          not_found: Translation not found
+          created: 翻译创建成功
+          creation_failure: 翻译创建失败
+          updated: 翻译更新成功
+          update_failure: 翻译更新失败
+          deleted: 翻译删除成功
+          not_found: 翻译不存在
 
           new:
-            title: New Translation
+            title: 新翻译
           edit:
-            title: Editing Translation
+            title: 编辑翻译
           form:
-            preview: Preview
-            create: Create
-            update: Update
-            cancel: Return to Page
+            preview: 预览
+            create: 创建
+            update: 更新
+            cancel: 取消
           sidebar:
-            new: New Translation
-            confirm: Are you sure?
+            new: 新翻译
+            confirm: 确定刪除该翻译吗?
 
         snippets:
           created: 片段创建成功
@@ -206,10 +206,10 @@ zh-CN:
             revision: 修订版本
             update: 更新到该修订版本
             cancel: 取消
-            content: Content
-            changes: Changes
-            previous: Previous
-            current: Current
+            content: 内容
+            changes: 更改
+            previous: 先前
+            current: 当前
           sidebar:
             revision:
               zero: '%{count} 修订版本'

data/config/locales/zh-TW.yml

@@ -6,7 +6,7 @@ zh-TW:
       comfy/cms/page: 頁面
       comfy/cms/snippet: 片段
       comfy/cms/file: 文件
-      comfy/cms/translation: Translation
+      comfy/cms/translation: 翻譯
 
     attributes:
       comfy/cms/site:
@@ -41,10 +41,10 @@ zh-TW:
         label: 標籤
         content: 內容
       comfy/cms/translation:
-        locale: Language
-        label: Label
-        layout_id: Layout
-        is_published: Published
+        locale: 語言
+        label: 標籤
+        layout_id: 佈局
+        is_published: 發佈
 
   comfy:
     cms:
@@ -57,7 +57,7 @@ zh-TW:
       cms:
         base:
           site_not_found: 沒有該站點
-          seeds_enabled: CMS 樣板已經啟用，在此處的所有修改將被忽略。
+          seeds_enabled: CMS樣板已經啟用，在此處的所有修改將被忽略。
 
           sites: 站點
           layouts: 佈局
@@ -113,7 +113,7 @@ zh-TW:
             select_parent_layout: 選擇上級佈局
             select_app_layout: 選擇應用佈局
             create: 創建佈局
-            cancel: Cancel
+            cancel: 取消
             update: 更新佈局
 
         pages:
@@ -153,25 +153,25 @@ zh-TW:
               編輯內容使其包含一個頁面或者欄位標記。例如： <code>{{cms:wysiwyg content}}</code>
 
         translations:
-          created: Translation created
-          creation_failure: Failed to create translation
-          updated: Translation updated
-          update_failure: Failed to update translation
-          deleted: Translation deleted
-          not_found: Translation not found
+          created: 翻譯創建成功
+          creation_failure: 翻譯創建失敗
+          updated: 翻譯更新成功
+          update_failure: 翻譯更新失敗
+          deleted: 翻譯刪除成功
+          not_found: 翻譯不存在
 
           new:
-            title: New Translation
+            title: 新翻譯
           edit:
-            title: Editing Translation
+            title: 編輯翻譯
           form:
-            preview: Preview
-            create: Create
-            update: Update
-            cancel: Return to Page
+            preview: 預覽
+            create: 創建
+            update: 更新
+            cancel: 取消
           sidebar:
-            new: New Translation
-            confirm: Are you sure?
+            new: 新翻譯
+            confirm: 確定刪除該翻譯嗎?
 
         snippets:
           created: 片段創建成功

data/lib/comfortable_mexican_sofa/content/tags/partial.rb

@@ -24,7 +24,7 @@ class ComfortableMexicanSofa::Content::Tag::Partial < ComfortableMexicanSofa::Co
   end
 
   def content
-    "<%= render partial: '@path', locals: #{@locals} %>"
+    "<%= render partial: \"#{@path}\", locals: #{@locals} %>"
   end
 
   def render

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,5 +1,5 @@
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.4".freeze
+  VERSION = "2.0.5".freeze
 
 end

data/test/lib/content/renderer_test.rb

@@ -222,7 +222,7 @@ class ContentRendererTest < ActiveSupport::TestCase
 
   def test_render_with_erb_allowed_via_tag
     out = render_string("{{cms:partial path}}")
-    assert_equal "<%= render partial: '@path', locals: {} %>", out
+    assert_equal "<%= render partial: \"path\", locals: {} %>", out
   end
 
   def test_render_with_nested_tag

data/test/lib/content/tags/partial_test.rb

@@ -23,12 +23,12 @@ class ContentTagsPartialTest < ActiveSupport::TestCase
 
   def test_content
     tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
-    assert_equal "<%= render partial: '@path', locals: {\"key\"=>\"val\"} %>", tag.content
+    assert_equal "<%= render partial: \"path/to/partial\", locals: {\"key\"=>\"val\"} %>", tag.content
   end
 
   def test_render
     tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
-    assert_equal "<%= render partial: '@path', locals: {\"key\"=>\"val\"} %>", tag.render
+    assert_equal "<%= render partial: \"path/to/partial\", locals: {\"key\"=>\"val\"} %>", tag.render
   end
 
   def test_render_with_whitelist
@@ -38,7 +38,7 @@ class ContentTagsPartialTest < ActiveSupport::TestCase
     assert_equal "", tag.render
 
     tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "safe/path")
-    assert_equal "<%= render partial: '@path', locals: {} %>", tag.render
+    assert_equal "<%= render partial: \"safe/path\", locals: {} %>", tag.render
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -697,7 +697,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails 5.2+ CMS Engine