jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2015-03-11 10:16:23 +08:00
parent 9060c9acbc 12c72308f0
commit d177f1ae89
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@ -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

2
lib/redmine/plugin.rb
View File

@ -77,7 +77,7 @@ module Redmine #:nodoc:
# Adds plugin locales if any
# YAML translation files should be found under <plugin>/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)