Commit
047d0710a7434afe643b8ca2f1a41e855af80b7e
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Merge branch 'plugins-i18n' into 'master'
Load locales inside plugins directory
See merge request !338
|
| @@ -115,6 +115,8 @@ module Noosfero |
| @@ -115,6 +115,8 @@ module Noosfero |
|
115
| :key => '_noosfero_session', |
115
| :key => '_noosfero_session', |
|
116
| } |
116
| } |
|
117
| |
117
| |
|
| |
118
| + config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins/*}/locales/*.{rb,yml}" |
|
| |
119
| + |
|
118
| Noosfero::Plugin.setup(config) |
120
| Noosfero::Plugin.setup(config) |
|
119
| |
121
| |
|
120
| end |
122
| end |
