From c2f494911dfbd08d06a7050235c8fbc06d9129d1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 09:33:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9en.yml=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 09cf7ead4..d89f3fc13 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1465,8 +1465,8 @@ en: label_activity_time: publish date label_your_course: your course - label_have_message : have a new message - :lable_not_receive_mail: Click here don't receive email form site！ + label_have_message: have a new message + lable_not_receive_mail: Click here don't receive email form site！ #added by linchun as competition# label_current_hot_contest: Latest Hot Competition From aa3ab86fb094d1ca0915b56bf1177e982aa26392 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 09:48:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?#2013=20=E4=B8=AA=E4=BA=BA=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5--=E7=95=99=E8=A8=80--=E7=95=99=E8=A8=80=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E4=B8=8D=E8=A7=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/words/_new.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb index 4a76856f2..561c6a953 100644 --- a/app/views/words/_new.html.erb +++ b/app/views/words/_new.html.erb @@ -47,15 +47,15 @@ <% if User.current.logged? %> - <% if @user.safe_attribute? 'user_message' %> + <%# if @user.safe_attribute? 'user_message' %> <%= f.text_area 'user_message', :rows => 3, :cols => 65, :placeholder => "#{l(:label_leave_a_message)}", :style => "resize: none; width: 98%", :class => 'noline'%> - <% end %> + <%# end %> <%= f.text_field :reference_user_id, :style=>"display:none"%> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> - <% else %> + <%else %>
<%= l(:label_user_login_tips) %> <%= link_to l(:label_user_login_new), signin_path %> From 284625de8f2ab9473e3b5059e3d4123189f89de8 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 10:07:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index d89f3fc13..e9fadb636 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -27,7 +27,7 @@ en: notice_account_deleted: "Your account has been permanently deleted." notice_user_successful_create: "User %{id} created." - error_attachment_empty: "error in add file" + error_attachment_empty: "error in add file" error_class_period_only_num: "class period can only digital" error_can_t_load_default_data: "Default configuration could not be loaded: %{value}" error_scm_not_found: "The entry or revision was not found in the repository." @@ -1656,8 +1656,8 @@ en: label_add_tag: Add Tag #api - label_recently_updated_notification: Recently updated notification - label_recently_updated_homework: Recently updated the homework - label_recently_updated_message: Recently updated the message - label_recently_updated_courseware: Recently updated the courseware - label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course! + label_recently_updated_notification: Recently updated notification + label_recently_updated_homework: Recently updated the homework + label_recently_updated_message: Recently updated the message + label_recently_updated_courseware: Recently updated the courseware + label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course! From 5732f0ed032425c4b0d64180677e5cf2c287f71d Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 11 Mar 2015 10:10:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?en.yml=E5=AD=98=E5=9C=A8=E4=B8=AD=E6=96=87=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=EF=BC=8C=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 16 ++++++++-------- lib/redmine/plugin.rb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 09cf7ead4..b0b27a683 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1420,7 +1420,7 @@ en: label_new_join: Join label_new_join_order: Please input the course order. - label_homeworks_form_new_description: Release a task,the submit form of the task may be accessory or project,setting in the task form. + label_homeworks_form_new_description: Release a task, the submit form of the task may be accessory or project, setting in the task form. label_course_settings: Setting field_homework_type: Submit form label_task_submit_form_accessory: Submitted as accessory @@ -1465,8 +1465,8 @@ en: label_activity_time: publish date label_your_course: your course - label_have_message : have a new message - :lable_not_receive_mail: Click here don't receive email form site！ + label_have_message: have a new message + lable_not_receive_mail: Click here don't receive email form site！ #added by linchun as competition# label_current_hot_contest: Latest Hot Competition @@ -1656,8 +1656,8 @@ en: label_add_tag: Add Tag #api - label_recently_updated_notification: Recently updated notification - label_recently_updated_homework: Recently updated the homework - label_recently_updated_message: Recently updated the message - label_recently_updated_courseware: Recently updated the courseware - label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course! + label_recently_updated_notification: Recently updated notification + label_recently_updated_homework: Recently updated the homework + label_recently_updated_message: Recently updated the message + label_recently_updated_courseware: Recently updated the courseware + label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course! diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 1185cd016..f9ce53ce2 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -77,7 +77,7 @@ module Redmine #:nodoc: # Adds plugin locales if any # YAML translation files should be found under /config/locales/ ::I18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', '*.yml')) - ::I18n.load_path += Dir.glob(File.join(Rails.root, 'config', 'locales', '**','*.yml')) + ::I18n.load_path += Dir.glob(File.join(Rails.root, 'config', 'locales', '**', '*.yml')) # Prepends the app/views directory of the plugin to the view path view_path = File.join(p.directory, 'app', 'views') if File.directory?(view_path) From 9060c9acbcb09bf8634b0d12994c46b460b7ac95 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 10:16:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?#1977=20=E9=A1=B9=E7=9B=AE=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=96=B0=E8=B4=B4=E8=B7=B3=E8=BD=AC=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 1 + app/views/boards/_project_show.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 67355fdfa..f797c7a2f 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -30,6 +30,7 @@ class BoardsController < ApplicationController def index #modify by nwb + @flag = params[:flag] || false if @project @boards = @project.boards.includes(:last_message => :author).all @boards = [] << @boards[0] if @boards.any? diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 9a3b79051..1d9408e86 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -7,7 +7,7 @@ } } -