From a6f6dc271c7be1b181615daee1aeb3ffab8c420b Mon Sep 17 00:00:00 2001 From: Fu Matthew Date: Mon, 18 Feb 2013 15:13:31 +0800 Subject: [PATCH] fix i18n,reload problems --- Gemfile | 8 +-- app/assets/javascripts/page_edit.js.erb | 4 ++ .../admin/page_parts_controller.rb | 12 ++++- app/controllers/default_widget_controller.rb | 1 - app/helpers/admin/page_parts_helper.rb | 36 +++++++++++++ app/helpers/default_widget_helper.rb | 2 +- app/models/module_app.rb | 4 +- .../_default_widget_setting.html.erb | 8 +-- .../admin/page_parts/_module_widget.html.erb | 2 +- .../page_parts/reload_widget_field.js.erb | 1 + config/locales/zh_tw.yml | 1 + config/routes.rb | 1 + lib/orbit_app/module/side_bar.rb | 2 +- lib/orbit_app/module/widget.rb | 6 +-- lib/tasks/migrate.rake | 51 +++++++++++++++++++ .../ad_banner/config/locales/zh_tw.yml | 3 +- vendor/built_in_modules/ad_banner/init.rb | 2 +- .../announcement/config/locales/zh_tw.yml | 4 +- vendor/built_in_modules/announcement/init.rb | 2 +- .../archive/config/locales/zh_tw.yml | 2 + vendor/built_in_modules/archive/init.rb | 4 +- .../miss_module/config/locales/zh_tw.yml | 20 ++++---- .../page_content/config/locales/zh_tw.yml | 2 + vendor/built_in_modules/page_content/init.rb | 4 +- .../personal_book/config/locales/zh_tw.yml | 3 +- vendor/built_in_modules/personal_book/init.rb | 4 +- .../config/locales/zh_tw.yml | 3 +- .../personal_conference/init.rb | 4 +- .../personal_diploma/config/locales/zh_tw.yml | 3 +- .../built_in_modules/personal_diploma/init.rb | 4 +- .../config/locales/zh_tw.yml | 3 +- .../personal_experience/init.rb | 4 +- .../personal_honor/config/locales/zh_tw.yml | 3 +- .../built_in_modules/personal_honor/init.rb | 4 +- .../personal_journal/config/locales/zh_tw.yml | 2 + .../built_in_modules/personal_journal/init.rb | 4 +- .../personal_lab/config/locales/zh_tw.yml | 3 +- vendor/built_in_modules/personal_lab/init.rb | 4 +- .../personal_patent/config/locales/zh_tw.yml | 3 +- .../built_in_modules/personal_patent/init.rb | 4 +- .../personal_project/config/locales/zh_tw.yml | 3 +- .../built_in_modules/personal_project/init.rb | 4 +- .../config/locales/zh_tw.yml | 3 +- .../personal_research/init.rb | 4 +- 44 files changed, 185 insertions(+), 66 deletions(-) create mode 100644 app/views/admin/page_parts/reload_widget_field.js.erb diff --git a/Gemfile b/Gemfile index 1e2a6448..de03e4fd 100644 --- a/Gemfile +++ b/Gemfile @@ -72,10 +72,10 @@ end group :test, :development do - #gem 'pry' - #gem 'pry-remote' - #gem 'pry-stack_explorer' - #gem 'pry-debugger' + gem 'pry' + gem 'pry-remote' + gem 'pry-stack_explorer' + gem 'pry-debugger' gem 'faker' gem "sunspot-rails-tester" diff --git a/app/assets/javascripts/page_edit.js.erb b/app/assets/javascripts/page_edit.js.erb index aec24de6..b7771692 100644 --- a/app/assets/javascripts/page_edit.js.erb +++ b/app/assets/javascripts/page_edit.js.erb @@ -42,6 +42,10 @@ $("#tag_list select").live('change', function() { $.getScript($(this).attr('rel') + '/' + $(this).val() + '/reload_r_tag_options'); }); +$("select.widget_field_select").live('change', function() { + $.getScript(get_object_path() + '/reload_after_widget_field_changed?widget_field_value='+ $(this).val()+'&dom_id=' + $(this).attr("id") + '&field_seri=' +$(this).attr('field_seri')); +}); + $('.part_kind').live('click', function() { $('.part_kind_partial').hide(); $('#part_' + $(this).attr('value')).show(); diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb index 21050985..d591dd83 100644 --- a/app/controllers/admin/page_parts_controller.rb +++ b/app/controllers/admin/page_parts_controller.rb @@ -55,9 +55,10 @@ class Admin::PagePartsController < ApplicationController def update @part = PagePart.find(params[:id]) - - params[:page_part][:widget_field] = params[:page_part][:widget_field].zip( params[:page_part][:widget_field_type] ) if params[:page_part][:widget_field] + params[:page_part][:widget_field] = params[:page_part][:widget_field].zip( params[:page_part][:widget_field_type],params[:page_part][:widget_field_is_link] ) + params[:page_part][:widget_field_type] = nil + params[:page_part][:widget_field_is_link] = nil if params[:page_part][:module_app].blank? params[:page_part][:module_app] = nil @@ -90,6 +91,13 @@ class Admin::PagePartsController < ApplicationController redirect_to admin_items_url( :parent_id => @item.parent_id ) end + def reload_widget_field + @index = params[:field_seri].to_i + @part = PagePart.find params[:id] + @choosen_field = params[:widget_field_value] + @module_app = @part.module_app + end + def reload_widgets @part = PagePart.find params[:id] @module_app = ModuleApp.find(params[:module_app_id]) rescue nil diff --git a/app/controllers/default_widget_controller.rb b/app/controllers/default_widget_controller.rb index 637810cd..6580b70f 100644 --- a/app/controllers/default_widget_controller.rb +++ b/app/controllers/default_widget_controller.rb @@ -24,7 +24,6 @@ class DefaultWidgetController< OrbitWidgetController @page_part.widget_data_count.is_a?(Fixnum) ? @page_part.widget_data_count : (@page_part.widget_data_count.to_i rescue 3) end @data = eval(@default_widget["query"]).limit(data_limit).includes(@widget_image_field) - case params[:type] when "typeA" @tag_class = 'default_widget_typeA' diff --git a/app/helpers/admin/page_parts_helper.rb b/app/helpers/admin/page_parts_helper.rb index 818fe46b..5eeb553d 100644 --- a/app/helpers/admin/page_parts_helper.rb +++ b/app/helpers/admin/page_parts_helper.rb @@ -9,6 +9,42 @@ module Admin::PagePartsHelper end end + def get_widget_field_rel(local_item=nil) + local_item = @part if local_item.nil? && @part + local_item = @page if local_item.nil? && @page + + case local_item + when Page + admin_pages_path + when PagePart + admin_page_parts_path + end + end + + def field_link_switch(i,object_name,field_name,local_item=nil,prefill_value=nil) + local_item = @part if local_item.nil? && @part + local_item = @page if local_item.nil? && @page + res = '' + choosen_value = prefill_value || local_item[:widget_field][i][0] + choosen_field_is_link = (@module_app.widget_fields.select{|t| t[0].to_s==choosen_value}.first)[2]==:link + + if choosen_field_is_link + value = case local_item + when Page + local_item[:frontend_field][i][2] + when PagePart + local_item[:widget_field][i][2] + end + + res = label_tag '' do + check_box_tag("#{object_name}[#{field_name}_is_link][]", value = "true", value) + I18n.t("default_widget.field_is_link") + end + else # choosen_field_not_link + res = hidden_field_tag "#{object_name}[#{field_name}_is_link][]", 'false' + end # of if choosen_field_is_link + + end + def widget_field_options(i,local_item=nil) local_item = @part if local_item.nil? && @part local_item = @page if local_item.nil? && @page diff --git a/app/helpers/default_widget_helper.rb b/app/helpers/default_widget_helper.rb index 645f50f0..7f917449 100644 --- a/app/helpers/default_widget_helper.rb +++ b/app/helpers/default_widget_helper.rb @@ -1,6 +1,6 @@ module DefaultWidgetHelper def get_field_header(field) - I18n.t(@page_part.module_app.widget_fields.select{|t|t[0]==field}[0][1]) + I18n.t("#{@page_part.module_app.key}.default_widget.#{field}") end def link_to_field(row_data,field) diff --git a/app/models/module_app.rb b/app/models/module_app.rb index fb735438..b10d581f 100644 --- a/app/models/module_app.rb +++ b/app/models/module_app.rb @@ -6,7 +6,7 @@ class ModuleApp field :key field :title - field :sidebar_order#,type: Integer + field :sidebar_order,type: Integer,default: 0 def refetch_setting!(reg) # %w{module_label category base_url version organization author intro update_info create_date}.each do |field| @@ -30,7 +30,7 @@ class ModuleApp end def get_default_widget - raise 'Need to link with OrbitApp [type: Array]' + get_registration.get_default_widget end diff --git a/app/views/admin/page_parts/_default_widget_setting.html.erb b/app/views/admin/page_parts/_default_widget_setting.html.erb index 8496b19b..f4546178 100644 --- a/app/views/admin/page_parts/_default_widget_setting.html.erb +++ b/app/views/admin/page_parts/_default_widget_setting.html.erb @@ -31,13 +31,15 @@
<%= i+1 %> - <%= select_tag "#{object_name}[#{field_name}][]", widget_field_options(i), :include_blank => true %> + <%= select_tag "#{object_name}[#{field_name}][]", widget_field_options(i), :include_blank => true ,:class=>'widget_field_select',:field_seri => i ,:id=>"#{object_name}_#{field_name}_#{i}"%> <%= select_tag "#{object_name}[#{field_name}_type][]", widget_fiield_type_options(i), :include_blank => true %>
- -

+ + <%= field_link_switch(i,object_name,field_name) %> + +
<% end %>
diff --git a/app/views/admin/page_parts/_module_widget.html.erb b/app/views/admin/page_parts/_module_widget.html.erb index 38fb013f..e1f81263 100644 --- a/app/views/admin/page_parts/_module_widget.html.erb +++ b/app/views/admin/page_parts/_module_widget.html.erb @@ -26,7 +26,7 @@ <%= t "default_widget.select_widget_path" %>
- <%= f.select :widget_path, @module_app ? @module_app.widgets.collect{|k,v| [I18n.t(v["i18n"]),k]} : [], {}, { :selected => @part.widget_path, :rel => admin_page_parts_path } %> + <%= f.select :widget_path, @module_app ? @module_app.widgets.collect{|k,v| [I18n.t(v["i18n"]),k]} : [], {}, { :selected => @part.widget_path, :rel => get_widget_field_rel } %>
diff --git a/app/views/admin/page_parts/reload_widget_field.js.erb b/app/views/admin/page_parts/reload_widget_field.js.erb new file mode 100644 index 00000000..32482e51 --- /dev/null +++ b/app/views/admin/page_parts/reload_widget_field.js.erb @@ -0,0 +1 @@ +$("#<%= params[:dom_id] %>").parents(".rows").find(".link_switch_holder").html("<%= j field_link_switch(@index,'page_part','widget_field',nil,@choosen_field) %>"); \ No newline at end of file diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 8578514c..4023b466 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -120,6 +120,7 @@ zh_tw: name: 預設樣式 no_support_setting: 沒有可以使用的設定 no_value: 不設定（全部） + field_is_link: 連結 fields_: 前台輸出欄位 fields_order: 輸出欄位順序 fields_style: 輸出欄位樣式 diff --git a/config/routes.rb b/config/routes.rb index 62c12180..c9e77b6b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -114,6 +114,7 @@ Orbit::Application.routes.draw do resources :page_parts do member do + get 'reload_after_widget_field_changed',:action=>'reload_widget_field' get 'reload_after_module_changed',:action=>'reload_widgets' get 'reload_after_list_changed',:action=> 'reload_widget_styles' get 'reload_r_tag_options' diff --git a/lib/orbit_app/module/side_bar.rb b/lib/orbit_app/module/side_bar.rb index 60424ae0..50811f03 100644 --- a/lib/orbit_app/module/side_bar.rb +++ b/lib/orbit_app/module/side_bar.rb @@ -66,7 +66,7 @@ module OrbitApp end def get_sidebar_order! - @sidebar_order = get_module_app.sidebar_order + @sidebar_order = (get_module_app.sidebar_order rescue 0) end def get_module_app diff --git a/lib/orbit_app/module/widget.rb b/lib/orbit_app/module/widget.rb index 38b15a76..42e02a4e 100644 --- a/lib/orbit_app/module/widget.rb +++ b/lib/orbit_app/module/widget.rb @@ -98,11 +98,11 @@ module OrbitApp def self.get_interface_args #will need to work with design - {:name=>"default_widget",:field=>nil,:label=>'label',:style=>STYLE,:i18n=>'default_widget.default_widget'} + {:name=>"default_widget",:field=>@fields,:style=>STYLE,:i18n=>'default_widget.default_widget'} end def to_module_app_format - {:query=>@query,:image=>@image} rescue nil + {"query"=>@query,"image"=>@image} rescue nil end def link_field(field_name,setting) @@ -161,7 +161,7 @@ module OrbitApp def to_hash - {:name => @name,:fields=>@fields,:label=>@label,:style=>@style,:i18n=>@widget_i18n} + {:name => @name,:fields=>@fields,:style=>@style,:i18n=>@widget_i18n} end protected diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index 14516d93..6582fa2a 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -439,5 +439,56 @@ namespace :migrate do ma.save end end + task :cleanup_page_part_without_page => :environment do + pps = PagePart.all.select{|t| t.page.nil? } + pps.each{|t| t.destroy} + end + task :backup_module_app_info => :environment do + + PagePart.all.each do |pp| + pp[:backup_module_app_key] = (pp.module_app ? pp.module_app.key : nil) + pp.save + puts pp.inspect + end + + Page.all.each do |page| + page[:backup_module_app_key] = (page.module_app ? page.module_app.key : nil) + page.save + puts page.inspect + end + + end + + task :rebind_module_app => :environment do + Page.all.each do |page| + if page[:backup_module_app_key].nil? + page.module_app = nil + else + page.module_app = ModuleApp.where(:key=> page[:backup_module_app_key]).first + end + page.save + end + + PagePart.all.each do |pp| + if pp[:backup_module_app_key].nil? + pp.module_app = nil + else + pp.module_app = ModuleApp.where(:key=> pp[:backup_module_app_key]).first + end + pp.save + end + end + + task :clean_up_module_app_info => :environment do + Page.all.each do |page| + page.unset(:backup_module_app_key) + page.save + end + + PagePart.all.each do |pp| + pp.unset(:backup_module_app_key) + pp.save + end + end end diff --git a/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml b/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml index 9b3771f7..70168488 100644 --- a/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml @@ -1,4 +1,3 @@ zh_tw: - - ad_banner: + module_name: ad_banner: 廣告輪播 \ No newline at end of file diff --git a/vendor/built_in_modules/ad_banner/init.rb b/vendor/built_in_modules/ad_banner/init.rb index e9aec9c7..3e7d5e39 100644 --- a/vendor/built_in_modules/ad_banner/init.rb +++ b/vendor/built_in_modules/ad_banner/init.rb @@ -1,6 +1,6 @@ module AdBanner OrbitApp.registration "AdBanner",:type=> 'ModuleApp' do - module_label 'miss_module_i18n.ad_banner' + module_label 'module_name.ad_banner' base_url File.expand_path File.dirname(__FILE__) # personal_plugin :enable => true,:path=>"panel/ad_banner/plugin/profile",:i18n=>'admin.ad_banner' diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index 995bf2f5..d24c1265 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -11,8 +11,8 @@ zh_tw: editing_announcement_category: 編輯公告類別 error: no_avilb_cate_for_posting: 公告必需有一個類別才能發送，請與管理員聯絡 - front_end: - bulletins: 請ＬＩＮ給名字前台頁 + frontend: + bulletins: 公告前台 new_bulletin_category: 新增公告類別 search: 搜尋公告 update_bulletin_success: 公告已成功更新 diff --git a/vendor/built_in_modules/announcement/init.rb b/vendor/built_in_modules/announcement/init.rb index 30ce57b8..f8f1cf89 100644 --- a/vendor/built_in_modules/announcement/init.rb +++ b/vendor/built_in_modules/announcement/init.rb @@ -13,7 +13,7 @@ module Announcement front_end do app_page 'bulletins' do - frontend_i18n "announcement.front_end.bulletins" + frontend_i18n "announcement.frontend.bulletins" end end diff --git a/vendor/built_in_modules/archive/config/locales/zh_tw.yml b/vendor/built_in_modules/archive/config/locales/zh_tw.yml index d110eaf1..0369e6f6 100644 --- a/vendor/built_in_modules/archive/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/archive/config/locales/zh_tw.yml @@ -6,6 +6,8 @@ zh_tw: all: 全部檔案 widget: archive_files: 檔案室Wiget + frontend: + archive: 檔案室前台 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/archive/init.rb b/vendor/built_in_modules/archive/init.rb index b29fe2ca..2ba59753 100644 --- a/vendor/built_in_modules/archive/init.rb +++ b/vendor/built_in_modules/archive/init.rb @@ -15,7 +15,9 @@ module Archive update_info 'some update_info' front_end do - app_page 'archive_files' + app_page 'archive_files' do + frontend_i18n "archive.frontend.archive" + end end widgets do diff --git a/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml b/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml index 664dc7c9..a3d6d5d9 100644 --- a/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml @@ -2,15 +2,13 @@ zh_tw: miss_module_i18n: - miss_plugin_i18n: - personal_book: Personal Book - personal_diploma: Personal Diploma - personal_experience: Personal Experience - personal_honor: Personal Honor - personal_journal: Personal Journal - personal_lab: Personal Lab - personal_patent: Personal Patent - personal_project: Personal Project - personal_research: Personal Research - personal_conference: Personal Conference + # miss_plugin_i18n: + + # personal_experience: 經歷 + # personal_honor: 榮譽 + + + # personal_project: 研究計畫 + # personal_research: 研究 + # personal_conference: 研討會論文 diff --git a/vendor/built_in_modules/page_content/config/locales/zh_tw.yml b/vendor/built_in_modules/page_content/config/locales/zh_tw.yml index a5df3f73..2e47402f 100644 --- a/vendor/built_in_modules/page_content/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/page_content/config/locales/zh_tw.yml @@ -5,3 +5,5 @@ zh_tw: create_page_content_success: 頁面內容已成功建立 editing_page_content: 編輯頁面內容 update_page_content_success: 頁面內容已成功更新 + frontend: + page: 頁面前台 \ No newline at end of file diff --git a/vendor/built_in_modules/page_content/init.rb b/vendor/built_in_modules/page_content/init.rb index 5d779836..064489b4 100644 --- a/vendor/built_in_modules/page_content/init.rb +++ b/vendor/built_in_modules/page_content/init.rb @@ -12,7 +12,9 @@ module PageContent update_info 'some update_info' front_end do - app_page 'page_contexts' + app_page 'page_contexts' do + frontend_i18n "page_content.frontend.page" + end end side_bar do diff --git a/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml index a0104cbd..2d8c73a7 100644 --- a/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_book: 專書 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_book/init.rb b/vendor/built_in_modules/personal_book/init.rb index 47bff5bd..8275f505 100644 --- a/vendor/built_in_modules/personal_book/init.rb +++ b/vendor/built_in_modules/personal_book/init.rb @@ -1,8 +1,8 @@ module PersonalBook OrbitApp.registration "Book",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_book' + module_label 'module_name.personal_book' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:i18n=>'miss_module_i18n.personal_book' + personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:i18n=>'module_name.personal_book' end diff --git a/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml index a0104cbd..71dcb56f 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_conference: 研討會論文 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_conference/init.rb b/vendor/built_in_modules/personal_conference/init.rb index c4eca015..8c830c0e 100644 --- a/vendor/built_in_modules/personal_conference/init.rb +++ b/vendor/built_in_modules/personal_conference/init.rb @@ -1,8 +1,8 @@ module PersonalConference OrbitApp.registration "Conference",:type=> 'ModuleApp' do - module_label 'admin.personal_conference' + module_label 'module_name.personal_conference' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_conference/plugin/profile",:i18n=>'admin.personal_conference' + personal_plugin :enable => true,:path=>"panel/personal_conference/plugin/profile",:i18n=>'module_name.personal_conference' end diff --git a/vendor/built_in_modules/personal_diploma/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_diploma/config/locales/zh_tw.yml index a0104cbd..d4f945ce 100644 --- a/vendor/built_in_modules/personal_diploma/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_diploma/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_diploma: 學歷 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_diploma/init.rb b/vendor/built_in_modules/personal_diploma/init.rb index adf2ce23..de611c65 100644 --- a/vendor/built_in_modules/personal_diploma/init.rb +++ b/vendor/built_in_modules/personal_diploma/init.rb @@ -1,8 +1,8 @@ module PersonalDiploma OrbitApp.registration "Diploma",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_diploma' + module_label 'module_name.personal_diploma' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_diploma/plugin/profile",:i18n=>'miss_plugin_i18n.personal_diploma' + personal_plugin :enable => true,:path=>"panel/personal_diploma/plugin/profile",:i18n=>'module_name.personal_diploma' end diff --git a/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml index a0104cbd..46d24587 100644 --- a/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_experience: 經歷 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_experience/init.rb b/vendor/built_in_modules/personal_experience/init.rb index b1cc47a2..e3f9685d 100644 --- a/vendor/built_in_modules/personal_experience/init.rb +++ b/vendor/built_in_modules/personal_experience/init.rb @@ -1,9 +1,9 @@ module PersonalExperience OrbitApp.registration "Experience",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_experience' + module_label 'module_name.personal_experience' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_experience/plugin/profile",:i18n=>'miss_plugin_i18n.personal_experience' + personal_plugin :enable => true,:path=>"panel/personal_experience/plugin/profile",:i18n=>'module_name.personal_experience' end diff --git a/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml index a0104cbd..67853500 100644 --- a/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_honor: 榮譽 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_honor/init.rb b/vendor/built_in_modules/personal_honor/init.rb index 7c27a359..05382140 100644 --- a/vendor/built_in_modules/personal_honor/init.rb +++ b/vendor/built_in_modules/personal_honor/init.rb @@ -1,8 +1,8 @@ module PersonalHonor OrbitApp.registration "Honor",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_honor' + module_label 'module_name.personal_honor' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_honor/plugin/profile",:i18n=>'miss_plugin_i18n.personal_honor' + personal_plugin :enable => true,:path=>"panel/personal_honor/plugin/profile",:i18n=>'module_name.personal_honor' end diff --git a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml index 19bf1aa2..ed89a4d7 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml @@ -1,4 +1,6 @@ zh_tw: + module_name: + personal_journal: 期刊著作 personal_journal: paper_title : "論文名稱" journal_title : "期刊名稱" diff --git a/vendor/built_in_modules/personal_journal/init.rb b/vendor/built_in_modules/personal_journal/init.rb index 42e8bdc3..e586bf89 100644 --- a/vendor/built_in_modules/personal_journal/init.rb +++ b/vendor/built_in_modules/personal_journal/init.rb @@ -1,8 +1,8 @@ module PersonalJournal OrbitApp.registration "Journal",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_journal' + module_label 'module_name.personal_journal' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_journal/plugin/profile",:i18n=>'miss_plugin_i18n.personal_journal' + personal_plugin :enable => true,:path=>"panel/personal_journal/plugin/profile",:i18n=>'module_name.personal_journal' end diff --git a/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml index a0104cbd..035eec6a 100644 --- a/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_lab: 實驗室 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_lab/init.rb b/vendor/built_in_modules/personal_lab/init.rb index 989dc90f..c916ab7e 100644 --- a/vendor/built_in_modules/personal_lab/init.rb +++ b/vendor/built_in_modules/personal_lab/init.rb @@ -1,8 +1,8 @@ module PersonalLab OrbitApp.registration "Lab",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_lab' + module_label 'module_name.personal_lab' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_lab/plugin/profile",:i18n=>'miss_plugin_i18n.personal_lab' + personal_plugin :enable => true,:path=>"panel/personal_lab/plugin/profile",:i18n=>'module_name.personal_lab' end diff --git a/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml index a0104cbd..629eef60 100644 --- a/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_patent: 專利 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_patent/init.rb b/vendor/built_in_modules/personal_patent/init.rb index ff12d639..5f586941 100644 --- a/vendor/built_in_modules/personal_patent/init.rb +++ b/vendor/built_in_modules/personal_patent/init.rb @@ -1,8 +1,8 @@ module PersonalPatent OrbitApp.registration "Patent",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_patent' + module_label 'module_name.personal_patent' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_patent/plugin/profile",:i18n=>'miss_plugin_i18n.personal_patent' + personal_plugin :enable => true,:path=>"panel/personal_patent/plugin/profile",:i18n=>'module_name.personal_patent' end diff --git a/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml index a0104cbd..8aa797fa 100644 --- a/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_project: 研究計畫 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_project/init.rb b/vendor/built_in_modules/personal_project/init.rb index b0b8d69e..7bbd96b3 100644 --- a/vendor/built_in_modules/personal_project/init.rb +++ b/vendor/built_in_modules/personal_project/init.rb @@ -1,8 +1,8 @@ module PersonalProject OrbitApp.registration "Research Project",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_project' + module_label 'module_name.personal_project' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_project/plugin/profile",:i18n=>'miss_plugin_i18n.personal_project' + personal_plugin :enable => true,:path=>"panel/personal_project/plugin/profile",:i18n=>'module_name.personal_project' end diff --git a/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml index a0104cbd..bf02f4b1 100644 --- a/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml @@ -1,7 +1,8 @@ zh_tw: _locale: 中文 - + module_name: + personal_research: 研究 add: 新增 back: 回去 create: 創造 diff --git a/vendor/built_in_modules/personal_research/init.rb b/vendor/built_in_modules/personal_research/init.rb index 5787cd05..f1ab2662 100644 --- a/vendor/built_in_modules/personal_research/init.rb +++ b/vendor/built_in_modules/personal_research/init.rb @@ -1,8 +1,8 @@ module PersonalResearch OrbitApp.registration "Research",:type=> 'ModuleApp' do - module_label 'miss_plugin_i18n.personal_research' + module_label 'module_name.personal_research' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_research/plugin/profile",:i18n=>'miss_plugin_i18n.personal_research' + personal_plugin :enable => true,:path=>"panel/personal_research/plugin/profile",:i18n=>'module_name.personal_research' end