Integration of Ray' modifications

config/locales/en.yml

@@ -24,13 +24,17 @@ en:
   yes_: "Yes"
   
   admin:
+    action: Action
     add_language: Add language
     admin: Admin
     action: Action
     announcement: Announcement
     asset: Asset
     attributes: Attributes
+    cant_delete_self: You can not delete yourself.
+    cant_revoke_self_admin: You can not revoke your admin role yourself.
     class: Class
+    content: Content
     create_error_link: Error when creating link.
     create_error_page: Error when creating page.
     create_success_home: Homepage was successfully created.
@@ -38,7 +42,7 @@ en:
     create_success_link: Link was successfully created.
     create_success_page: Page was successfully created.
     create_success_snippet: Snippet was successfully created.
-    content: Content
+    create_success_user: User was successfully created.
     data: Data
     delete_language: Delete language
     description: Description
@@ -51,11 +55,14 @@ en:
     editing_snippet: Editing snippet
     editing_user_info: Editing user information
     editing_user_role: Editing user role
+    email: Email
     enable_language: Enable language
     file_name: Filename
     file_size: File size
     format: Format
+    home: Home
     id: ID
+    info: Information
     is_published: Is published
     item: Item
     key: Key
@@ -67,11 +74,14 @@ en:
     list_items: Items list
     list_puchases: Purchases list
     list_snippets: Snippets list
+    list_users: Users list
     list_user_infos: User information list
     list_user_roles: User roles list
+    member: Member
     move_down: Move down
     move_up: Move up
     multilingual: Multilingual
+    my_avatar: My Avatar
     no_home_page: You don't have a homepage
     no_layout: You don't have a layout
     name: Name
@@ -82,6 +92,7 @@ en:
     new_link: New link
     new_page: New page
     new_snippet: New snippet
+    new_user: New user
     new_user_info: New user information
     new_user_role: New user role
     non_multilingual: Non multilingual
@@ -90,13 +101,13 @@ en:
     position: Position
     published?: Published?
     purchase: Purchase
-    info: Information
     registered: Registered
     role: Role
+    roles: Roles
     title: Title
     translation: Translation
     type: Type
-    up_to_date: Up-do-date
+    up_to_date: Up-to-date
     update_error_link: Error when updating link.
     update_error_page: Error when updating page.
     update_success_content: Content was successfully updated.
@@ -105,24 +116,11 @@ en:
     update_success_link: Link was successfully updated.
     update_success_page: Page was successfully updated.
     update_success_snippet: Snippet was successfully updated.
+    update_success_user: User was successfully updated.
     url: URL
+    user: User
     user_info: User information
+    user_panel: User panel
     user_role: User role
     
   panel:
-    action: Action
-    admin: Admin
-    cant_delete_self: You can not delete yourself.
-    cant_revoke_self_admin: You can not revoke your admin role yourself.
-    create_success_user: User was successfully created.
-    email: Email
-    home: Home
-    list_users: Users list
-    my_avatar: My Avatar
-    name: Name
-    new_user: New user
-    infos: Information
-    roles: Roles
-    update_success_user: User was successfully updated.
-    user: User
-    user_panel: User panel

config/locales/zh_tw.yml

@@ -19,12 +19,15 @@ zh_tw:
   yes_: "Yes"
   
   admin:
+    action: 行動
     add_language: 新增語言
     admin: 管理
     action: 行動
     announcement: 公告
     asset: 資產
     attributes: 屬性
+    cant_delete_self: 您不可以刪除自己。
+    cant_revoke_self_admin: 您不可以撤銷自己的管理作用。
     class: 階級
     content: 內容
     create_error_link: 創建連接時出錯。
@@ -33,7 +36,8 @@ zh_tw:
     create_success_layout: 樣板已成功創建。
     create_success_link: 連結已成功創建。
     create_success_page: 頁面已成功創建。
-    create_success_snippet: 片段已成功創建。
+    create_success_snippet: 片段已成功創建
+    create_success_user: 用戶已成功創建。。
     data: 數據
     delete_language: 刪除語言
     description: 描述
@@ -45,11 +49,14 @@ zh_tw:
     editing_snippet: 編輯片段
     editing_user_info: 編輯用戶資料
     editing_user_role: 編輯用戶角色
+    email: Email
     enable_language: 啟用語言
     file_name: 檔名
     file_size: 檔案大小
     format: 格式
+    home: 首頁
     id: ID
+    info: 資料
     is_published: 被出版
     item: 項目
     key: 關鍵
@@ -60,11 +67,14 @@ zh_tw:
     list_items: 項目清單
     list_layouts: 佈局清單
     list_snippets: 斷片清單
+    list_users: 使用清單
     list_user_infos: 用戶資料清單
     list_user_roles: 用戶角色清單
+    member: 會員
     move_down: 往下移
     move_up: 往上移
     multilingual: 多種語言
+    my_avatar: 我的頭像
     no_home_page: 您沒有首頁
     no_layout: 您沒有佈局
     name: 名稱
@@ -75,6 +85,7 @@ zh_tw:
     new_link: 新增連結
     new_page: 新增頁面
     new_snippet: 新增片段
+    new_user: 新增使用
     new_user_info: 新增用戶資料
     new_user_role: 新增用戶角色
     non_multilingual: 非多種語言
@@ -82,8 +93,8 @@ zh_tw:
     orig_upload_file: 原上傳檔名
     position: 位置
     published?: 發布?
-    info: 資料
     role: 角色
+    roles: 角色。
     title: 標題
     translation: 翻譯
     type: 類型
@@ -95,27 +106,14 @@ zh_tw:
     update_success_link: 連結已成功更新。
     update_success_page: 頁面已成功更新。
     update_success_snippet: 片段已成功更新。
+    update_success_user: 用戶已成功更新
     url: URL
+    user: 用戶
     user_info: 用戶資料
+    user_panel: 用戶面板
     user_role: 用戶角色
     
   panel:
-    action: 行動
-    admin: 管理
-    cant_delete_self: 您不可以刪除自己。
-    cant_revoke_self_admin: 您不可以撤銷自己的管理作用。
-    create_success_user: 用戶已成功創建。
-    email: Email
-    home: 首頁
-    list_users: 使用清單
-    my_avatar: 我的頭像
-    name: 名稱
-    new_user: 新增使用
-    infos: 資料
-    roles: 角色
-    update_success_user: 用戶已成功更新。
-    user: 用戶
-    user_panel: 用戶面板
     
     
     

config/routes.rb

@@ -46,6 +46,7 @@ PrototypeR4::Application.routes.draw do
     resources :sites
     resources :snippets
     resources :translations
+    resources :users
     resources :user_info_models
     resources :user_role_models
   end