camaleon_cms 2.4.3.5 → 2.4.3.6

data/config/locales/camaleon_cms/admin/fr.yml

@@ -224,7 +224,7 @@ fr:
         edit: 'Editer'
         add: 'Ajouter'
         list: 'Liste'
-        list_of: 'Liste de'
+        list_of: 'Liste de %{post_type}'
         new_site: 'Nouveau site'
         edit_site: 'Editer site'
         update: 'Mettre à jour'

data/config/locales/camaleon_cms/admin/it.yml

@@ -225,7 +225,7 @@ it:
         edit: 'Modifica'
         add: 'Aggiungi'
         list: 'Lista'
-        list_of: 'Lista di'
+        list_of: 'Lista di %{post_type}'
         new_site: 'Nuovo sito'
         edit_site: 'Modifica sito'
         update: 'Aggiorna'

data/config/locales/camaleon_cms/admin/js.yml

@@ -57,48 +57,48 @@ zh-CN:
           approved: '批准'
           draft: '保存草稿成功'
           updated_success: '已成功更新'
-          edit_menu: '按照您喜歡的順序放置每個項目. 單擊鉛筆的圖標以編輯項目，然後單擊x形式的圖標以刪除項目'
-          delete_item: '真的要刪除此項嗎？'
-          remove_items_submenu: '真的刪除此項目及其子菜單項？'
-          you_must_upload_image: '您必須上傳圖片'
-          you_must_upload_video: '您必須上傳視頻'
-          no_response_fields: '無響應字段 '
-          you_must_upload_json_file: '您必須上傳一個json文件'
-          no_templates_defined: '未定義模板'
-          avatar_updated: '更新頭像'
-          form_error: '表單錯誤'
-          option_title: '選項標題'
-          permalink: '固定鏈接'
-          pending: '有待'
-          preview: '預覽'
-          spam: '無用'
-          view_page: '見頁'
-          view_draft: '查看草案'
-          recover: '恢復...'
-          processing: '處理...'
-          type_contents: '類型內容'
-          upload_image: '上傳圖片'
-          confirm_del: "您確定要刪除此項目嗎？"
-          media_title: '媒體上傳器'
-          replace_image: '替換圖像'
-          save_new_image: '保存新圖像'
+          edit_menu: '按照您喜欢的顺序放置每个项目。单击铅笔的图标以编辑项目，然后单击 x 形式的图标以删除项目。'
+          delete_item: '真的要删除此项吗？'
+          remove_items_submenu: '真的删除此项目及其子菜单项？'
+          you_must_upload_image: '您必须上传图片'
+          you_must_upload_video: '您必须上传视频'
+          no_response_fields: '无响应字段 '
+          you_must_upload_json_file: '您必须上传一个 JSON 文件'
+          no_templates_defined: '未定义模板'
+          avatar_updated: '更新头像'
+          form_error: '表单错误'
+          option_title: '选项标题'
+          permalink: '固定链接'
+          pending: '待定'
+          preview: '预览'
+          spam: '无用'
+          view_page: '查看页面'
+          view_draft: '查看草稿'
+          recover: '恢复...'
+          processing: '处理中...'
+          type_contents: '类型内容'
+          upload_image: '上传图片'
+          confirm_del: '您确定要删除此项目吗？'
+          media_title: '媒体上传器'
+          replace_image: '替换图片'
+          save_new_image: '保存新图片'
 
         button:
-          edit: "編輯"
-          accept: "接受"
-          cancel: "取消"
-          delete: "刪除"
-          clone: "克隆"
-          add_tag: '添加標籤'
-          close: '關'
-          settings: '設置'
-          save: "保存"
-          submit: "提交"
-          name: "名稱"
-          size: "尺寸"
-          insert: "插"
-          url: "網址"
-          root: "根"
+          edit: '编辑'
+          accept: '接受'
+          cancel: '取消'
+          delete: '刪除'
+          clone: '克隆'
+          add_tag: '添加标签'
+          close: '关闭'
+          settings: '设置'
+          save: '保存'
+          submit: '提交'
+          name: '名称'
+          size: '尺寸'
+          insert: '插入'
+          url: '网址'
+          root: '根'
 
 pt-BR:
   camaleon_cms:

data/config/locales/camaleon_cms/admin/nl.yml

@@ -221,7 +221,7 @@ nl:
         edit: 'Bewerk'
         add: 'Toevoegen'
         list: 'Lijst'
-        list_of: 'Lijst van'
+        list_of: 'Lijst van %{post_type}'
         new_site: 'Nieuwe site'
         edit_site: 'Site sewerken'
         update: 'Bijwerken'

data/config/locales/camaleon_cms/admin/pt-BR.yml

@@ -218,7 +218,7 @@ pt-BR:
         edit: 'Editar'
         add: 'Adicionar'
         list: 'Listar'
-        list_of: 'Lista de'
+        list_of: 'Lista de %{post_type}'
         new_site: 'Novo Site'
         edit_site: 'Editar Site'
         update: 'Atualizar'

data/config/locales/camaleon_cms/admin/pt.yml

@@ -216,7 +216,7 @@ pt:
         edit: 'Editar'
         add: 'Adicionar'
         list: 'Listar'
-        list_of: 'Lista de'
+        list_of: 'Lista de %{post_type}'
         new_site: 'Novo Site'
         edit_site: 'Editar Site'
         update: 'Atualizar'

data/config/locales/camaleon_cms/admin/ru.yml

@@ -221,7 +221,7 @@ ru:
         edit: 'Редактировать'
         add: 'Добавить'
         list: 'Список'
-        list_of: 'Список '
+        list_of: 'Список %{post_type}'
         new_site: 'Новый сайт'
         edit_site: 'Редактировать сайт'
         update: 'Обновить'

data/config/locales/camaleon_cms/admin/zh-CH.yml

@@ -5,7 +5,7 @@ zh-CN:
     page_not_exist: "<h1>此页面不存在 :(...</h1><h5>您访问的页面不存在.</h5>"
     page_error_500: "<h1>ooops...</h1><h5>内部服务器500错误。 请联系管理员。</h5>"
     admin:
-      request_error_message: "发生错误,请联系管理员。"
+      request_error_message: "发生错误，请联系管理员。"
       authorization_error: "你没有授权。"
       header:
         member_since: "成员开始日期： %{time}"
@@ -77,9 +77,9 @@ zh-CN:
           approved: '批准'
           change_status: '该评论状态已经被修改 '
           created: '评论已经被创建.'
-          destroy: '回复经被删除.'
+          destroy: '回复已经被删除.'
           destroy_comments: '评论已经被删除.'
-          deleted: '回复经被删除.'
+          deleted: '回复已经被删除.'
           error: '没发现该评论'
           pending: '处理中'
           responses: '回复已经被创建.'
@@ -113,14 +113,23 @@ zh-CN:
           image_versions_descr: "创建上传图片的附加多个版本，示例：300x300,505x350 ==>将创建两个具有这些尺寸的额外图片"
           image_thumb: '缩略图'
           image_thumb_descr: "定义缩略图的尺寸，示例：100x100。 默认值：％{d}"
+          required_image_thumb: '必须有缩略图？'
           numeric: '数字'
           phone: '号码'
           users: '用户'
           posts: '文章'
+          video: '视频'
+          audio: '音频'
+          editor: '编辑器'
+          radio: '单选按钮'
+          checkbox: '复选框'
+          checkboxes: '多选复选框'
+          url: '链接'
+          private_file: '私有文件'
           select_eval: '选择评估'
           field_attrs: '字段属性'
           website: '网站'
-          multiple_choice: '单选按钮'
+          multiple_choice: '多选按钮'
 
 
       login:
@@ -145,7 +154,7 @@ zh-CN:
           invalid_caption: '验证码错误'
           email_not_validated: '邮箱未被激活.'
           confirm_email_token_incorrect: '激活链接错误'
-          confirm_email_token_expired: '激活链接已过去'
+          confirm_email_token_expired: '激活链接已失效'
           confirm_email_success: '账户成功激活!'
         personal_info: '个人信息'
         please_login: '请登录'
@@ -179,9 +188,10 @@ zh-CN:
         home: "主页"
         info: "信息"
         external: "上传从URL"
-        folder_name: '文件夾名稱'
-        reload: '重新加載'
-        clear_cache: '清除緩存'
+        folder_name: '文件夹名称'
+        folder_file_name: '文件夹或文件名'
+        reload: '重新加载'
+        clear_cache: '清除缓存'
       menus:
         link_url: '链接网址'
         target: '目标'
@@ -205,12 +215,12 @@ zh-CN:
         data_found_list: '没有数据列表中找到'
         delete: '确定删除该记录?'
         delete_item: '真的要删除吗?'
-        edit_menu: '选中您要操作的地方。点击铅笔的图标编辑条目,单击图标的形式x删除条目.'
+        edit_menu: '选中您要操作的地方。点击铅笔的图标编辑条目，单击图标的形式x删除条目。'
         add_menus: '从左列添加菜单项.'
-        press_no_continue_work_press_yes_logout: '如果不需要继续操作,请按登出按钮.'
+        press_no_continue_work_press_yes_logout: '如果不需要继续操作，请按登出按钮。'
         updated_success: '更新成功'
         remove_items_submenu: '真的删除此项目及其子菜单项？'
-        you_must_upload_image: '必须上传图片格式'
+        you_must_upload_image: '必须上传图片'
         you_must_upload_video: '必须上传视频'
         so_their_data_has_not_been_saved: '数据还未保存'
         no_response_fields: '无响应字段'
@@ -222,7 +232,7 @@ zh-CN:
         was_removed: '被移除.'
         processing: '处理中...'
         change_photo: '使用下面的形式上传文件。只允许图像文件。'
-        change_password: '修改你的密码先输入旧密码,然后输入新密码和重复新密码.'
+        change_password: '修改你的密码先输入旧密码，然后输入新密码和重复新密码。'
         you_must_upload_json_file: '你必须上传一个json文件'
         import_process: '导入中'
         unauthorized: "拒绝访问"
@@ -237,7 +247,7 @@ zh-CN:
         edit: '编辑'
         add: '添加'
         list: '列表'
-        list_of: '的列表'
+        list_of: '%{post_type}的列表'
         new_site: '新建站点'
         edit_site: '编辑站点'
         update: '更新'
@@ -247,6 +257,7 @@ zh-CN:
         clone_content: '复制内容'
         label_required: '必填标签'
         placeholder_required: '必填占位符'
+        is_featured: '推荐文章'
         message:
           created: '%{post_type} 已经被创建.'
           updated: '%{post_type} 已经被更新.'
@@ -265,7 +276,7 @@ zh-CN:
         add: '添加'
         add_category: '添加类别'
         add_post_type: '添加文章类型'
-        add_new: '添加新闻'
+        add_new: '添加%{type_title}'
         add_post_tag: '添加文章标签'
         categories: '种类'
         category: '种类'
@@ -281,6 +292,7 @@ zh-CN:
         default_layout: '默认布局'
         default_template: '默认模板'
         icon: '图标'
+        icons_url_desc: '请输入这个网址里面的任意图标名称: '
         message:
           error: '错误类'
           error_term: '错误项'
@@ -303,11 +315,12 @@ zh-CN:
         layout: '布局'
         trash: '回收站'
         tooltip:
+          permission_to_support_parent_structure: '允许文章显示父页面'
           permission_asing_categories: '选择种类权限'
           permission_add_tags: '添加标签权限'
           permission_add_content: '允许添加内容'
           permission_add_content_summary: '允许添加内容总结'
-          permission_reviews: '启用该选项以指示是否可以注释帖子内容'
+          permission_reviews: '启用该选项以指示是否可以评论帖子内容'
           permission_add_image_presentation: '允许编辑图片'
           permission_manage_template: '允许选择模板。 （template：将用于呈现内容的文件）'
           permission_manage_layout: '允许选择字段在内容中布局。 （布局：文件包装器将在其中呈现模板）'
@@ -325,6 +338,8 @@ zh-CN:
         type_contents: '种类内容'
         upgrade_to: "升级到"
       settings:
+        comment_anonymous: '允许匿名评论？'
+        custom_fields_show_shortcodes: '显示自定义字段的短代码？'
         activate_create_account: '激活该账户'
         activate_login_social_networks: '允许登录'
         add_field_group: '添加字段组'
@@ -363,12 +378,18 @@ zh-CN:
         seo_setting: "SEO 设置"
         email_settings: "邮件设置 (SMTP)"
         filesystem_type: "文件系统"
+        media_settings: "媒体设置"
+        filesystem_settings: "文件系统设置"
         filesystem_s3_access_key: "AWS S3 Access Key"
         filesystem_s3_secret_key: "AWS S3 Secret Key"
         filesystem_s3_bucket_name: "AWS S3 Bucket name"
         filesystem_s3_endpoint: "AWS S3 Bucket endpoint"
+        filesystem_max_file_size: "最大接受文件[MB]"
+        filesystem_thumb_size: "缩略图尺寸[100x100]"
+        file_actions_in_modals: "在 modal 里显示所有文件"
+        aws: '将文件保存到 AWS S3'
         send_test_email: '发送测试邮件'
-        filesystem_region: "AWS S3 Region"
+        filesystem_region: "AWS S3 区域"
         filesystem_cdn: "CDN url"
         security:
           captcha_user_register: "支持用户注册验证码?"
@@ -448,6 +469,8 @@ zh-CN:
         basic: '基础'
         categories: '分类'
         updated_at: "更新于"
+        permit_is_featured: '允许推荐文章'
+        manage_parent_structure: '管理页面层级'
         comments: '评论'
         count: '统计'
         date_published: '发布日期'
@@ -563,21 +586,24 @@ zh-CN:
         edit_profile: '编辑 资料'
         list_users: '用户列表'
         list_user_roles: '用户角色'
+        post_types: '文章类型'
         message:
-         error: '未发现用户.'
-         error_captcha: 'Oh! 验证码错误!'
-         created: '用户已经被创建.'
-         updated: '用户已经被更新.'
-         deleted: '用户已经被删除'
-         incorrect_old_password: '旧密码不正确'
-         rol_error: '未发现组用户.'
-         rol_created: '用户r角色已经被创建.'
-         rol_updated: '用户r角色已经被更新.'
-         rol_deleted: '用户r角色已经被删除'
-         requires_different_name: '需要不同的名字'
-         requires_different_username: '需要不同的用户名'
-         requires_different_email: '需要不同的邮箱'
-         created_pending_validate_email: "用户已经被创建, 请进入邮箱确认"
+          error: '未发现用户.'
+          error_captcha: 'Oh! 验证码错误!'
+          created: '用户已经被创建.'
+          updated: '用户已经被更新.'
+          deleted: '用户已经被删除'
+          incorrect_old_password: '旧密码不正确'
+          rol_error: '未发现组用户.'
+          rol_created: '用户r角色已经被创建.'
+          rol_updated: '用户r角色已经被更新.'
+          rol_deleted: '用户r角色已经被删除'
+          requires_different_name: '需要不同的名字'
+          requires_different_username: '需要不同的用户名'
+          requires_different_email: '需要不同的邮箱'
+          created_pending_validate_email: "用户已经被创建, 请进入邮箱确认"
+          role_can_not_be_deleted: '无法删除此角色'
+          user_can_not_delete_own_account: '用户不能删除自己的帐户'
         new_photo: '新建照片'
         others_permissions: '其他权限'
         profile: '资料'

data/config/routes/frontend.rb

@@ -14,18 +14,51 @@ Rails.application.routes.draw do
 
       controller "camaleon_cms/frontend" do
         get :index
-        get ":label/:post_type_id-:title" => :post_type, as: "post_type", constraints: {post_type_id: /[0-9]+/, label: /(#{PluginRoutes.all_translations('routes.group', default: 'group').join('|')})/}
-        get ":label/:post_type_id-:title/:slug" => :post, as: "post_of_post_type", constraints: {post_type_id: /[0-9]+/, label: /(#{PluginRoutes.all_translations('routes.group', default: 'group').join('|')})/}
-        get ":label/:category_id-:title" => :category, as: "category", constraints: {category_id: /[0-9]+/, label: /(#{PluginRoutes.all_translations('routes.category', default: 'category').join('|')})/}
-        get ":label_cat/:category_id-:title/:slug" => :post, as: "post_of_category", constraints: {category_id: /[0-9]+/, label_cat: /(#{PluginRoutes.all_translations('routes.category', default: 'category').join('|')})/}
-        get ":post_type_title/:label_cat/:category_id-:title/:slug" => :post, as: "post_of_category_post_type", constraints:{ post_type_title: /(?!(#{PluginRoutes.all_locales}))[\w\.\-]+/, category_id: /[0-9]+/, label_cat: /(#{PluginRoutes.all_translations('routes.category', default: 'category').join('|')})/ }
-        get ":label/:post_tag_id-:title" => :post_tag, as: "post_tag", constraints: {post_tag_id: /[0-9]+/, label: /(#{PluginRoutes.all_translations('routes.tag', default: 'tag').join('|')})/}
-        get ":label/:post_tag_id-:title/:slug" => :post, as: "post_of_tag", constraints: {post_tag_id: /[0-9]+/, label: /(#{PluginRoutes.all_translations('routes.tag', default: 'tag').join('|')})/}
-        get ":label/:post_tag_slug" => :post_tag, as: "post_tag_simple", constraints: {post_tag_slug: /[a-zA-Z0-9_=\s\-\/]+/, label: /(#{PluginRoutes.all_translations('routes.tag', default: 'tag').join('|')})/}
-        get ":label/:user_id-:user_name" => :profile, as: :profile, defaults:{label: 'profile'}, constraints: {user_id: /[0-9]+/, label: /(#{PluginRoutes.all_translations('routes.profile', default: 'profile').join('|')})/}
-        get ":label" => :search, as: :search, defaults:{label: 'search'}, constraints: {label: /(#{PluginRoutes.all_translations('routes.search', default: 'search').join('|')})/}
-
-        get ':post_type_title/:slug' => :post, as: :post_of_posttype, constraints:{ post_type_title: /(?!(#{PluginRoutes.all_locales}))[\w\.\-]+/ }
+        get ':label/:post_type_id-:title' => :post_type, as: 'post_type', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.group', default: 'group')
+          request.params[:post_type_id].match(/[0-9]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label/:post_type_id-:title/:slug' => :post, as: 'post_of_post_type', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.group', default: 'group')
+          request.params[:post_type_id].match(/[0-9]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label/:category_id-:title' => :category, as: 'category', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.category', default: 'category')
+          request.params[:category_id].match(/[0-9]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label_cat/:category_id-:title/:slug' => :post, as: 'post_of_category', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.category', default: 'category')
+          request.params[:category_id].match(/[0-9]+/) && request.params[:label_cat].in?(multilingual_segment)
+        }
+        get ':post_type_title/:label_cat/:category_id-:title/:slug' => :post, as: 'post_of_category_post_type', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.category', default: 'category')
+          request.params[:post_type_title].match(/^(?!(#{PluginRoutes.all_locales})$)[\w\.\-]+$/) &&
+            request.params[:category_id].match(/[0-9]+/) && request.params[:label_cat].in?(multilingual_segment)
+        }
+        get ':label/:post_tag_id-:title' => :post_tag, as: 'post_tag', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.tag', default: 'tag')
+          request.params[:post_tag_id].match(/[0-9]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label/:post_tag_id-:title/:slug' => :post, as: 'post_of_tag', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.tag', default: 'tag')
+          request.params[:post_tag_id].match(/[0-9]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label/:post_tag_slug' => :post_tag, as: 'post_tag_simple', constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.tag', default: 'tag')
+          request.params[:post_tag_slug].match(/[a-zA-Z0-9_=\s\-\/]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label/:user_id-:user_name' => :profile, as: :profile, defaults:{label: 'profile'}, constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.profile', default: 'profile') | %w(profile)
+          request.params[:user_id].match(/[0-9]+/) && request.params[:label].in?(multilingual_segment)
+        }
+        get ':label' => :search, as: :search, defaults:{label: 'search'}, constraints: ->(request) {
+          multilingual_segment = PluginRoutes.all_translations('routes.search', default: 'search') | %w(search)
+          request.params[:label].in?(multilingual_segment)
+        }
+
+        get ':post_type_title/:slug' => :post, as: :post_of_posttype, constraints: ->(request) {
+          request.params[:post_type_title].match(/^(?!(#{PluginRoutes.all_locales})$)[\w\.\-]+$/)
+        }
 
         post 'save_comment/:post_id' => :save_comment, as: :save_comment
         post 'save_form' => :save_form, as: :save_form
@@ -40,14 +73,20 @@ Rails.application.routes.draw do
         controller "camaleon_cms/frontend" do
           PluginRoutes.get_sites.each do |s|
             s.post_types.pluck(:slug, :id).each do |pt_slug, pt_id|
-              get ":post_type_slug" => :post_type, as: "post_type_#{pt_id}", post_type_id: pt_id, constraints: {post_type_slug: /(#{PluginRoutes.all_locales.split("|").map{|_l| I18n.t("routes.post_types.#{pt_slug}", default: pt_slug, locale: _l) }.uniq.join('|') })/}
+              get ':post_type_slug' => :post_type, as: "post_type_#{pt_id}", post_type_id: pt_id, constraints: ->(request) {
+                multilingual_segment = PluginRoutes.all_translations("routes.post_types.#{pt_slug}", default: pt_slug)
+                request.params[:post_type_slug].in?(multilingual_segment)
+              }
             end
           end
         end
 
         # posts
         constraints(format: /html|rss|json/) do
-          get ':parent_title/*slug(.:format)' => :post, as: :hierarchy_post, constraints:{ parent_title: /(?!(#{PluginRoutes.all_locales}))[\w\-]+/, slug: /[a-zA-Z0-9_=\s\-\/]+/ }
+          get ':parent_title/*slug(.:format)' => :post, as: :hierarchy_post, constraints: ->(request) {
+            request.params[:parent_title].match(/^(?!(#{PluginRoutes.all_locales})$)[\w\-]+$/) &&
+              request.params[:slug].match(/[a-zA-Z0-9_=\s\-\/]+/)
+          }
           get ":slug(.:format)" => :post, :as => :post, constraints: { slug: /[a-zA-Z0-9_=\s\-]+/}
         end
       end