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)