From dc3be3c9a13f57e56b48d2cb8baccf634d74b84a Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 27 Nov 2012 11:15:15 +0800 Subject: [PATCH] Translation changes --- .../admin/.designs_controller.rb.swp | Bin 16384 -> 0 bytes app/controllers/admin/designs_controller.rb | 1 - app/controllers/admin/purchases_controller.rb | 4 +- app/controllers/admin/users_controller.rb | 78 ---- .../desktop/co_authors_controller.rb | 4 +- .../desktop/journal_pages_controller.rb | 6 +- app/controllers/pages_controller.rb | 2 +- app/helpers/admin/items_helper.rb | 2 +- app/helpers/application_helper.rb | 7 - app/helpers/attribute_fields_helper.rb | 2 +- app/helpers/attribute_values_helper.rb | 20 +- app/models/.user.rb.swp | Bin 12288 -> 0 bytes app/models/user/attribute_field.rb | 2 +- app/views/.swp | Bin 12288 -> 0 bytes .../admin/ad_banners/_ad_banner_tab.html.erb | 4 +- .../ad_banners/_ad_image_update.html.erb | 2 +- .../ad_banners/_modal_ad_banner_form.html.erb | 2 +- .../admin/ad_banners/_modal_preview.html.erb | 4 +- .../admin/ad_banners/_preview_block.html.erb | 4 +- app/views/admin/ad_images/_form.html.erb | 22 +- app/views/admin/app_auths/index.html.erb | 2 +- .../asset_categories/_asset_category.html.erb | 2 +- .../admin/asset_categories/_form.html.erb | 4 +- app/views/admin/assets/_asset.html.erb | 2 +- .../attributes/_attribute_field.html.erb | 22 +- app/views/admin/attributes/edit.html.erb | 14 +- app/views/admin/attributes/index.html.erb | 2 +- .../components/_user_role_management.html.erb | 4 +- app/views/admin/designs/_design.html.erb | 2 +- app/views/admin/designs/_design_file.html.erb | 2 +- app/views/admin/designs/_images.html.erb | 4 +- app/views/admin/designs/edit.html.erb | 8 +- app/views/admin/infos/_form.html.erb.bak | 70 ---- app/views/admin/links/delete.html.erb | 2 +- .../_modal_list.html.erb | 2 +- app/views/admin/object_auths/index.html.erb | 2 +- .../_modal_list.html.erb | 2 +- app/views/admin/pages/delete.html.erb | 2 +- app/views/admin/plugins/index.html.erb | 2 +- app/views/admin/purchases/index.html.erb | 2 +- .../admin/roles/_attribute_field.html.erb.bak | 3 - app/views/admin/roles/_form.html.erb.bak | 52 --- app/views/admin/roles/_form_sub.html.erb.bak | 3 - app/views/admin/roles/_sub_role.html.erb.bak | 69 ---- app/views/admin/tags/_tag.html.erb | 2 +- app/views/admin/users/_form.html.erb | 40 -- app/views/admin/users/_info.html.erb | 40 -- .../admin/users/_show_attribute.html.erb | 26 -- app/views/admin/users/_show_sub_role.html.erb | 4 - app/views/admin/users/_side_bar.html.erb | 11 - app/views/admin/users/_sub_role.html.erb | 39 -- .../admin/users/_sub_role_selector.html.erb | 4 - app/views/admin/users/edit.html.erb | 14 - app/views/admin/users/index.html.erb | 42 --- app/views/admin/users/new.html.erb | 19 - app/views/admin/users/show.html.erb | 33 -- .../_deled_quick_edit.html.erb | 6 +- .../users_new_interface/_filter.html.erb | 28 +- .../_index_paginator.html.erb | 2 +- .../admin/users_new_interface/_role.html.erb | 2 +- .../users_new_interface/_side_bar.html.erb | 14 +- .../users_new_interface/_temp_form.html.erb | 8 +- .../users_new_interface/_user_basic.html.erb | 8 +- .../admin/users_new_interface/edit.html.erb | 2 +- .../admin/users_new_interface/index.html.erb | 2 +- .../index_summary.html.erb | 2 +- .../index_thumbnail.html.erb | 2 +- .../admin/users_new_interface/new.html.erb | 2 +- .../plugin_dashbroad.html.erb | 2 +- .../admin/users_new_interface/show.html.erb | 6 +- .../users_new_interface/temp_edit.html.erb | 2 +- app/views/layouts/_guest_orbit_menu.erb | 2 +- app/views/layouts/_member_orbit_menu.erb | 2 +- app/views/layouts/_orbit_bar.html.erb | 1 + app/views/layouts/_side_bar.html.erb | 2 +- app/views/layouts/_side_bar_content.html.erb | 46 +-- app/views/seminar_p.html.erb | 33 -- .../_address_modal_dialog.html.erb | 2 +- .../attribute_field/_attribute_field.html.erb | 32 +- .../attribute_field/_list_block.html.erb | 4 +- .../_placeholder_block.html.erb | 2 +- .../shared/preview/_modal_preview.html.erb | 4 +- config/locales/en.yml | 353 ++++-------------- config/locales/zh_tw.yml | 6 +- .../approvals/_modal_approve.html.erb | 6 +- .../back_end/approvals/_modal_list.html.erb | 2 +- .../_modal_list.html.erb | 2 +- .../_quick_edit_qe.html.erb | 7 - .../back_end/bulletins/_bulletin.html.erb | 2 +- .../bulletins/_bulletin_file_qe.html.erb | 6 +- .../bulletins/_bulletin_link_qe.html.erb | 6 +- .../back_end/bulletins/_file.html.erb | 4 +- .../back_end/bulletins/_form.html.erb | 4 +- .../bulletins/_modal_preview.html.erb | 4 +- .../bulletins/_quick_edit_picture.html.erb | 2 +- vendor/built_in_modules/announcement/init.rb | 2 +- .../page_contexts/_modal_preview.html.erb | 4 +- .../writing_books/_writing_book.html.erb | 2 +- .../writing_books/_writing_book.html.erb | 2 +- vendor/built_in_modules/personal_book/init.rb | 2 +- .../back_end/diplomas/_diploma.html.erb | 2 +- .../plugin/diplomas/_diploma.html.erb | 2 +- .../built_in_modules/personal_diploma/init.rb | 2 +- .../back_end/experiences/_experience.html.erb | 2 +- .../plugin/experiences/_experience.html.erb | 2 +- .../personal_experience/init.rb | 2 +- .../back_end/honors/_honor.html.erb | 2 +- .../plugin/honors/_honor.html.erb | 2 +- .../built_in_modules/personal_honor/init.rb | 2 +- .../_writing_journal.html.erb | 2 +- .../_writing_journal.html.erb | 2 +- .../built_in_modules/personal_journal/init.rb | 2 +- .../personal_lab/back_end/labs/_lab.html.erb | 2 +- .../personal_lab/plugin/labs/_lab.html.erb | 2 +- vendor/built_in_modules/personal_lab/init.rb | 2 +- .../writing_patents/_writing_patent.html.erb | 2 +- .../writing_patents/_writing_patent.html.erb | 2 +- .../built_in_modules/personal_patent/init.rb | 2 +- .../back_end/projects/_project.html.erb | 2 +- .../plugin/projects/_project.html.erb | 2 +- .../built_in_modules/personal_project/init.rb | 2 +- .../back_end/researchs/_research.html.erb | 2 +- .../plugin/researchs/_research.html.erb | 2 +- .../personal_research/init.rb | 2 +- .../_writing_seminar.html.erb | 2 +- .../_writing_seminar.html.erb | 2 +- .../built_in_modules/personal_seminar/init.rb | 2 +- .../back_end/web_links/_web_link.html.erb | 2 +- 128 files changed, 295 insertions(+), 1114 deletions(-) delete mode 100644 app/controllers/admin/.designs_controller.rb.swp delete mode 100644 app/controllers/admin/users_controller.rb delete mode 100644 app/models/.user.rb.swp delete mode 100644 app/views/.swp delete mode 100644 app/views/admin/infos/_form.html.erb.bak delete mode 100644 app/views/admin/roles/_attribute_field.html.erb.bak delete mode 100644 app/views/admin/roles/_form.html.erb.bak delete mode 100644 app/views/admin/roles/_form_sub.html.erb.bak delete mode 100644 app/views/admin/roles/_sub_role.html.erb.bak delete mode 100644 app/views/admin/users/_form.html.erb delete mode 100644 app/views/admin/users/_info.html.erb delete mode 100644 app/views/admin/users/_show_attribute.html.erb delete mode 100644 app/views/admin/users/_show_sub_role.html.erb delete mode 100644 app/views/admin/users/_side_bar.html.erb delete mode 100644 app/views/admin/users/_sub_role.html.erb delete mode 100644 app/views/admin/users/_sub_role_selector.html.erb delete mode 100644 app/views/admin/users/edit.html.erb delete mode 100644 app/views/admin/users/index.html.erb delete mode 100644 app/views/admin/users/new.html.erb delete mode 100644 app/views/admin/users/show.html.erb delete mode 100644 app/views/seminar_p.html.erb diff --git a/app/controllers/admin/.designs_controller.rb.swp b/app/controllers/admin/.designs_controller.rb.swp deleted file mode 100644 index 5131583d8ed5a7c691ee1798a04566efb8363594..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeHNTc{*Q87`wSn(Vq>9s**p&I~v+IcIy4-34W`XXD~wH4iJen*_}{$4*Um%}k%| z>2AAgcJ}O^jd>6R1uvivULFK5L0?t!6ciLCkO<-h1QGN>0)m2IL?crV ze13c?lsZI=J)sr$FQgaxX+DfpUu0Q7NE4N(aV+zqFT!b*^g~%h4-fed&Ucn@$l@X}q3eINJ&um_w3jsbtald%_p=Yj740q_9u zuQxLGBj7sl5#S!+k8fb?8K3~p19t$wy@Rn&0s^=QydO9R+y(sR^@s!bD&PZWfwus^ zzMZje0}5CL81UEEK|k<2;5pzYzz=~R0N({Z4}2Q<6!0W41_bapa1po%c=5H2{TTQJ z@F;K|@PKy#9C#;i40r(xGd~5M1U?L$0zBX-@Dl2b>g^X)ca4MN*obm(dPz;QFv`0f z^GSuTzm(%pJ3_YLjYk}+fm-BSE z<7p}SNyHSTOffpwGD|v2tp!RYA)J5$;{?eSc=}%BrdOz4+?YtI3cgz1-4T~X5#&*} za5tKYu`DWc#t)u}Tuh72fpu+L3zYg{X+wWvq8;g4*(luZK`fLbF2hJ^T2L2UCZR5E z|2fZbDsw&%fr`?Eub<%^D$y}wabcn-Iq)n41s=Knw8gidwq!z0x}`g0l#Wp>ipl06 zNmUfcZ8+JwI12(<6r))j@A6p|3ME7MM_CH&5^?NFd?*y@x+eW-L-Ikk=~}+-a;61^0J7#t&*qqHOlPkt)8c~vS!grp*PPXIDa)V`n_C= z5cDCs1LTKMGEKup&MIwi;T+L~TJIu5kmH?x2fsGfHQt%8c5Gf4hwL+3b|?zd>C_yv zc9aC^G$Wo(%9^4k+%itTY((#hG_+x4Y%-WaHi* z{NgO0^+I#V`z*KbN)>Yk_z^-96z{1HelsgC1`sPQs`rG%SnkQ-+*JK-YoNn&VLKTD$qF}IgzIw7$a36^> z?GKHR0^~+7nfni-T&U^F)1}G|koz1jH8rtJnm)D)sH%}N+3R#IQ@xVpyp0~HZ}Y6W zzaJUPecC=Uws%_Y*{uH6&hZn}k5Koi+exC80aUb1k)|-+I&u zlP=q%+y6$d;01A74gK1+0Ft8|+Q~dmb3L+qB#TqLL3P(tOww5#@}b0#hHP@RV%8j z;H^K$sH?2PX5_jfTvAL!1goTt(dmLAkG}0jE|$Zlb>6|J;BgcP8cDh@d$8NH z+^i{<`mu9?g}BtL^xtHY_VOyDjV&}=2=QB9UvXL5Ol!Id9dy`jH(J@DO*d4CS;Nq? zdFwUjcDtvV+Aplk*r+NRu{?v-faYGO_1&1YX0UXS%PbZFWJNxf%50c)^(G_vQ`uV^ zlsiZ3XK3}=u7WIrA<#z4Dz;fxDOkPEWA<474S>$jc>n+a diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb index a3824950a..913520fa8 100644 --- a/app/controllers/admin/designs_controller.rb +++ b/app/controllers/admin/designs_controller.rb @@ -101,7 +101,6 @@ class Admin::DesignsController < OrbitBackendController def create @design = Design.new(params[:design]) if @design.save - flash[:notice] = "Successfully created design and tasks." redirect_to admin_designs_url else render :action => 'new' diff --git a/app/controllers/admin/purchases_controller.rb b/app/controllers/admin/purchases_controller.rb index 116d18f37..f4d1ae2a2 100644 --- a/app/controllers/admin/purchases_controller.rb +++ b/app/controllers/admin/purchases_controller.rb @@ -112,7 +112,7 @@ class Admin::PurchasesController < ApplicationController log = Logger.new(STDOUT) log.level = Logger::WARN - log.warn("App unzip procress is finished,please restart the server to apply effect") + log.warn(t(:unzip_app)) #TODO Perform touch tmp/restart to restart in production env end @@ -159,7 +159,7 @@ class Admin::PurchasesController < ApplicationController log = Logger.new(STDOUT) log.level = Logger::WARN - log.warn("App unzip procress is finished,please restart the server to apply effect") + log.warn(t(:unzip_app)) } temp_file.close diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb deleted file mode 100644 index e0c8a8f9b..000000000 --- a/app/controllers/admin/users_controller.rb +++ /dev/null @@ -1,78 +0,0 @@ -class Admin::UsersController < ApplicationController - - layout "admin" - before_filter :authenticate_user! - before_filter :set_attribute, :only => [:index, :show, :new, :edit] - - def index - @users = User.all.entries - end - - def show - @user = User.find(params[:id]) - get_info_and_roles - end - - def new - @user = User.new - get_info_and_roles - end - - def create - puts params.to_yaml - @user = User.new(params[:user]) - if @user.save - flash[:notice] = t('create.success.user') - redirect_to :action => :index - else - render :action => :new - end - end - - def edit - @user = User.find(params[:id]) - get_info_and_roles - end - - def update - @user = User.find(params[:id]) - - # Update changes to the avatar - @user.remove_avatar! if params[:file] - @user.avatar = params[:file] if params[:file] - - if @user.id.to_s.eql?(session['warden.user.user.key'][1].to_s) && @user.admin != params[:user][:admin].to_i.to_b - flash.now[:error] = t(:cant_revoke_self_admin) - end - if !flash[:error] && @user.update_attributes(params[:user]) - flash[:notice] = t('update.success.user') - redirect_to :action => :index - else - get_info_and_roles - render :action => :edit - end - end - - def destroy - if params[:id].eql?(session['warden.user.user.key'][1].to_s) - flash[:error] = t(:cant_delete_self) - else - @user = User.find(params[:id]) - @user.destroy - end - - redirect_to :action => :index - end - - protected - - def get_info_and_roles - @infos = Info.excludes('disabled' => true) - @roles = Role.excludes('disabled' => true) - end - - def set_attribute - @class = 'users' - end - -end diff --git a/app/controllers/desktop/co_authors_controller.rb b/app/controllers/desktop/co_authors_controller.rb index d41e23488..261184fca 100644 --- a/app/controllers/desktop/co_authors_controller.rb +++ b/app/controllers/desktop/co_authors_controller.rb @@ -37,7 +37,7 @@ class Desktop::CoAuthorsController < ApplicationController @co_author.name_id= current_user.id if @co_author.save - render json: {success:true, msg: "Co-author successfully saved!"}.to_json + render json: {success:true, msg: t('create.sucess.co_author')}.to_json else error_msg = @co_author.errors.full_messages.join("
") render json: {success: false, msg: error_msg}.to_json @@ -48,7 +48,7 @@ class Desktop::CoAuthorsController < ApplicationController @co_author = CoAuthor.find(params[:id]) if @co_author.update_attributes(params[:co_author]) - render json: {success:true, msg: "Co-author successfully update!"}.to_json + render json: {success:true, msg: t('update.sucess.co_author')}.to_json else error_msg = @co_author.errors.full_messages.join("
") render json: {success: false, msg: error_msg}.to_json diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb index 69334a5b7..5b9310cc7 100644 --- a/app/controllers/desktop/journal_pages_controller.rb +++ b/app/controllers/desktop/journal_pages_controller.rb @@ -44,7 +44,7 @@ class Desktop::JournalPagesController < ApplicationController @writing_journal = WritingJournal.new(params[:writing_journal]) if @writing_journal.save - render json: {success: true, msg: "Paper successfully saved!"}.to_json + render json: {success: true, msg: t('create.success.paper')}.to_json else error_msg = @writing_journal.errors.full_messages.join("
") render json: {success: false, msg: error_msg}.to_json @@ -56,7 +56,7 @@ class Desktop::JournalPagesController < ApplicationController @writing_journal= WritingJournal.find(params[:id]) respond_to do |format| if @writing_journal.update_attributes(params[:writing_journal]) - render json: {success: true, msg: "Paper successfully saved!"}.to_json + render json: {success: true, msg: t('update.success.paper')}.to_json else error_msg = @writing_journal.errors.full_messages.join("
") render json: {success: false, msg: error_msg}.to_json @@ -76,7 +76,7 @@ class Desktop::JournalPagesController < ApplicationController def destroy @writing_journal = WritingJournal.find(params[:id]) @writing_journal.destroy - render :json => {success: true, msg: "Paper deleted successfully!"} + render :json => {success: true, msg: t('delete.success.paper')} end def get_journals_json diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 4c3084dd2..6e00b859f 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -10,7 +10,7 @@ class PagesController < ApplicationController impressionist(@item) render_page else - render :text => 'You need a home page' + render :text => t(:need_home) end end diff --git a/app/helpers/admin/items_helper.rb b/app/helpers/admin/items_helper.rb index 6763cff2a..948df59c1 100644 --- a/app/helpers/admin/items_helper.rb +++ b/app/helpers/admin/items_helper.rb @@ -18,7 +18,7 @@ module Admin::ItemsHelper ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page') ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page') ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page') - ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history') + ret << (link_to t(:delete_), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history') ret << "" ret << "" ret << render_children(node) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6f6bd13bd..068f6ab7a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -44,13 +44,6 @@ module ApplicationHelper User.find(session[:guest_user_id].nil? ? session[:guest_user_id] = create_guest_user.id : session[:guest_user_id]) end - - - - def colorize_in_use_locale(locale) - @site_in_use_locales.include?(locale)? 'green' : 'red' - end - def flash_messages return unless messages = flash.keys.select{|k| FLASH_NOTICE_KEYS.include?(k)} formatted_messages = messages.map do |type| diff --git a/app/helpers/attribute_fields_helper.rb b/app/helpers/attribute_fields_helper.rb index 270a55168..2705dc8fc 100644 --- a/app/helpers/attribute_fields_helper.rb +++ b/app/helpers/attribute_fields_helper.rb @@ -228,7 +228,7 @@ protected temp_field_name = get_basic_field_name_base + '[temp]' add_more = content_tag :div,:class=> 'controls' do content_tag :span,:class=> 'help-block' do - content = link_to (content_tag :i,I18n.t("admin.infos.add"),:class=>"icon-plus-sign"),"#",:class=>'addinput' + content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus-sign"),"#",:class=>'addinput' content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count") content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name") content diff --git a/app/helpers/attribute_values_helper.rb b/app/helpers/attribute_values_helper.rb index eede44fb3..2bc314324 100644 --- a/app/helpers/attribute_values_helper.rb +++ b/app/helpers/attribute_values_helper.rb @@ -33,7 +33,7 @@ module AttributeValuesHelper end year_str = "" unless date.year == 1912 - m_year = (date.year - 1912).abs.to_s + I18n.t("admin.infos.date.minguo_calendar.year") + m_year = (date.year - 1912).abs.to_s + I18n.t("date.minguo_calendar.year") year_str = minguo_format_year(m_year) end get_minguo_year + minguo_m_y_d_time @@ -42,15 +42,15 @@ module AttributeValuesHelper def get_minguo_year date = get_date m_year = (date.year - 1911).abs - year_end = I18n.t("admin.infos.date.minguo_calendar.year") + year_end = I18n.t("date.minguo_calendar.year") case when date.year <1912 - I18n.t("admin.infos.date.minguo_calendar.before") + (m_year+1).to_s + year_end + I18n.t("date.minguo_calendar.before") + (m_year+1).to_s + year_end when date.year ==1912 - I18n.t("admin.infos.date.minguo_calendar.first_year") + I18n.t("date.minguo_calendar.first_year") when date.year >1912 - I18n.t("admin.infos.date.minguo_calendar.after")+ (m_year).to_s + year_end - end # of case tw_claendar year + I18n.t("date.minguo_calendar.after")+ (m_year).to_s + year_end + end # of case tw_calendar year end def minguo_m_y_d_time @@ -61,7 +61,7 @@ module AttributeValuesHelper when 'format2' # Y/M/D date.strftime(" %m/%d") when 'format3' # Y/M - date.strftime(" %m#{I18n.t("admin.infos.date.minguo_calendar.month")}") + date.strftime(" %m#{I18n.t("date.minguo_calendar.month")}") when 'format4' # Y '' end # of case @@ -71,11 +71,11 @@ module AttributeValuesHelper case I18n.locale when :zh_tw case - when self.attribute_field["typeC"]["claendar"] == "west_claendar" + when self.attribute_field["typeC"]["calendar"] == "west_calendar" show_west_calender(from_to) - when self.attribute_field["typeC"]["claendar"] == "tw_claendar" + when self.attribute_field["typeC"]["calendar"] == "tw_calendar" show_minguo_calendar(from_to) - end #case self.attribute_field["typeC"]["claendar"] + end #case self.attribute_field["typeC"]["calendar"] when :en show_west_calender(from_to) end diff --git a/app/models/.user.rb.swp b/app/models/.user.rb.swp deleted file mode 100644 index 7149c0ea4b11b8b4004f272764825b1eff6d2bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2PiQ1X6o+f~;;M~pa*wgxM5vIwCqM6Brr@C2ct^(CLekvc~4R`~mHZV`FT)wol@We&>==s*ENBaTZfH&X` zcmv*mH{cC;1Kxl)@ZUCIiZkR6ws01_0L~1-o4>pPZ@?Sy2D|}pz#H%eya8{(8}J6a z0dL@cVt^%tJa!);>*uf`{Quwn4dAbb3Hby31ik>DgEn{-G{GYH`yoPp1V4b!zz5)M zkN^gr29JX~^Mw2gz6M_c306S}E`vqT0RPS*4txtf0q=shz*R5@&Vqj)B;-%K^wHdItai8aQl8jZh@QNBk&%$4G*`#P4FG~27C(M z2N8G;Yyj))CEzb_z#H%eya8{(8?Xj=o)Aj$sy} zRCH(iF*e~{8mFA)(d0mMEYNkH$v&q%E6fhNSY$v2o1tdsJfE0i|%FqU~DjF7pe%h%{`*yB6) zgB`HfXxkA%Dr1)NO{%z#OI~#auS=2FYqUvgjp6pUxT$oxT|dVSHQSt4I@};lbCz*U zrLwwMnIb~kyel0e{VhCGxsK)6>?4-Pq={_zrq_?$vzc{t*`5VzGhsQkk7~O7s(#v4 zGNTAOxcIDl>yHivjzCmZ_wMg)uVWk{O5C zGPLzVcL!`hS%BOFBO`oo%XS~t=e>y(YzRa zI};xM<)oT&VtpNSN|7c97sZJ&F-s?9d2huHwOQ)+(q_O}yiF5H2QF@aPFqFeRP}QG zNf%qybIa|~-bJzE*sZ(G#=$7YSgK^Il8*3ZtK<-GwpmYkvuz`9u79c`C%n1t6M3s9 zs=T?+qebCuVwNMlxwr$~T+2zl+2DiTI=m|tk2J%<9UgkFZ!;ZbEZ?EwSiN;V)$G!k zZQid>^x@SNJWXggac1a68k(H~y06jeN-=v(jiQoFXN&ao3j6rs^U#5s}AfnQ*!$^DQZoFnn3yw}D| Boolean,:default => false field :typeA,:type=> Hash,:default=>{:cross_lang=>false} field :typeB,:type=> Hash,:default=>{} - field :typeC,:type=> Hash,:default=>{:claendar=>"west_claendar",:format=>"format3"} + field :typeC,:type=> Hash,:default=>{:calendar=>"west_calendar",:format=>"format3"} field :typeD,:type=> Hash,:default=>{:cross_lang=>false} field :typeE,:type=> Hash,:default=>{} field :title, localize: true diff --git a/app/views/.swp b/app/views/.swp deleted file mode 100644 index a9dcf2b18d75c442e5ab8c3ff1624b964702018d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI%ONbmr9LMomm1uk=L_O$1qES)Ap2P@B;voovnuvIauAme(GqtmA`bBqjHY#{A z3dUoif}kJ^9&+*p9z@Vfh+fu13?5t+4+^puF~0Di->#n7>gnAbB|?ay20lC6JvH6` z{?)&$VYj>Wk^3Lqd}pv-@Y-1Ys9z^SA@-@zq@x`Z-pg*8m~z4Z|B+9?CvX-duzv6M z+qZ4qa{YCiuh_KrEU3qq;1lo(_yl|cJ^`PAPrxVO6YvR~$plO`CH~@s=iv~hhIsQY zpMX!mC*TwC3HStj0zLtsfKR|D;1lo(_yo?81XN#$!|Q}txQGkl|NqtB0RG${#3?M{ zdwh#;a1smn6rbQjyp5xH6G!kY62y1{4`CO!;RbBMl@R#pav{FM7dVEaconbUdCXxJ zk6{mX<8B1F78@~zpDz>Q2YiXo@Dbj{JYL3&cm_{n2GiJsyKoCO;R2kGQbL1ZIm*Ere3HStj0{{O65s0 z8!jW23}md6((UV|iP1^pm@3Pnu%}FzCT^7K$6;eL=tSzNv@|w>To1y+|A#zmp*9aUDOHsw9SkBZb)veF4xTLRte*CH z+_7bx_I2bgIOwcaK|N}ferbQ*&QPfajYevvbO|tB& zd}aO2XHrCVPOGxVlKO|1tOF>LFw3;#r6dur^lQ`nWiy($%= vc^8XO5Ihy=R{OK=AYo${!_0&&R@7%=RkndryM5x-Pn6}M^@=U3hlBVV?lJF4 diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 561609315..ac5c1ae0e 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -22,7 +22,7 @@ <%if (at_least_module_manager || ad_banner_tab.cur_user_is_sub_manager_of(:edit) )%> <%= content_tag :div ,:class=>'adbanner-action' do%> <%= link_to t("ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%> - <%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%> + <%= link_to t(:preview), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%> <% end -%> <% end -%>
    @@ -30,7 +30,7 @@
<% if at_least_module_manager %> <%= show_ad_banner_permission_link ad_banner_tab%> - <%= link_to t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %> + <%= link_to t(:delete_),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %> <% end -%> <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb index 15bb75d01..281d07538 100644 --- a/app/views/admin/ad_banners/_ad_image_update.html.erb +++ b/app/views/admin/ad_banners/_ad_image_update.html.erb @@ -7,7 +7,7 @@ <%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>

<%= link_to t('edit'),edit_admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn btn-primary' %> - <%= link_to t('delete'),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %> + <%= link_to t(:delete_),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>

<% end -%> \ No newline at end of file diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index dc77bc5f4..dc35a7044 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -25,7 +25,7 @@
<%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
- <%= f.text_field :best_size %> Ex: 500px x 300px + <%= f.text_field :best_size %> <%= t('ad.best_size_example') %>
diff --git a/app/views/admin/ad_banners/_modal_preview.html.erb b/app/views/admin/ad_banners/_modal_preview.html.erb index 3dc985216..adf84adb8 100644 --- a/app/views/admin/ad_banners/_modal_preview.html.erb +++ b/app/views/admin/ad_banners/_modal_preview.html.erb @@ -3,7 +3,7 @@ diff --git a/vendor/built_in_modules/personal_research/init.rb b/vendor/built_in_modules/personal_research/init.rb index 18bc59f65..ca9cd0587 100644 --- a/vendor/built_in_modules/personal_research/init.rb +++ b/vendor/built_in_modules/personal_research/init.rb @@ -16,7 +16,7 @@ end # :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'], # :active_for_ob_auths_object => ['NewsBulletinCategory'], # :head_link => panel_news_back_end_news_bulletins_path , -# :head_label=> I18n.t('admin.news') +# :head_label=> I18n.t(:news) # context_link :link=>new_panel_news_back_end_news_bulletin_path , # :priority=>1,:label=>I18n.t('announcement.add_new'), diff --git a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_writing_seminar.html.erb b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_writing_seminar.html.erb index 0814f76d9..b95718261 100644 --- a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_writing_seminar.html.erb +++ b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_writing_seminar.html.erb @@ -11,7 +11,7 @@
    <%if at_least_module_manager || writing_seminar.writing_seminar_category.cur_user_is_sub_manager_of(:edit)%>
  • <%= link_to t('edit'), edit_panel_personal_seminar_back_end_writing_seminar_path(writing_seminar) %>
    • -
  • <%= link_to t('delete'), panel_personal_seminar_back_end_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • +
  • <%= link_to t(:delete_), panel_personal_seminar_back_end_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • <% end -%>
diff --git a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_writing_seminar.html.erb b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_writing_seminar.html.erb index be2d983d2..8d001c475 100644 --- a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_writing_seminar.html.erb +++ b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_writing_seminar.html.erb @@ -11,7 +11,7 @@
    <%if at_least_module_manager || writing_seminar.writing_seminar_category.cur_user_is_sub_manager_of(:edit)%>
  • <%= link_to t('edit'), edit_panel_personal_seminar_plugin_writing_seminar_path(writing_seminar) %>
    • -
  • <%= link_to t('delete'), panel_personal_seminar_plugin_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • +
  • <%= link_to t(:delete_), panel_personal_seminar_plugin_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • <% end -%>
diff --git a/vendor/built_in_modules/personal_seminar/init.rb b/vendor/built_in_modules/personal_seminar/init.rb index 1bd9e9d02..6cb9829fe 100644 --- a/vendor/built_in_modules/personal_seminar/init.rb +++ b/vendor/built_in_modules/personal_seminar/init.rb @@ -16,7 +16,7 @@ end # :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'], # :active_for_ob_auths_object => ['NewsBulletinCategory'], # :head_link => panel_news_back_end_news_bulletins_path , -# :head_label=> I18n.t('admin.news') +# :head_label=> I18n.t(:news) # context_link :link=>new_panel_news_back_end_news_bulletin_path , # :priority=>1,:label=>I18n.t('announcement.add_new'), diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb index 2e4ef99d0..7032d761f 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb @@ -26,7 +26,7 @@
    <%if at_least_module_manager || web_link.web_link_category.cur_user_is_sub_manager_of(:edit)%>
  • <%= link_to t('edit'), edit_panel_web_resource_back_end_web_link_path(web_link) %>
    • -
  • <%= link_to t('delete'), panel_web_resource_back_end_web_link_path(web_link), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • +
  • <%= link_to t(:delete_), panel_web_resource_back_end_web_link_path(web_link), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • <% end -%>