github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-17 12:59:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Bump discourse_dev to 0.1.0 (#12722)

Browse Source 
And add the "discourse-development-auth" plugin and client locale files.
This commit is contained in:
Vinoth Kannan 2021-04-16 06:42:34 +05:30 committed by GitHub
parent d89e9fcfa3
commit e08432ddde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -114,7 +114,7 @@ GEM
railties (>= 3.1) railties (>= 3.1)
discourse-ember-source (3.12.2.3) discourse-ember-source (3.12.2.3)
discourse-fonts (0.0.8) discourse-fonts (0.0.8)
discourse_dev (0.0.9) discourse_dev (0.1.0)
faker (~> 2.16) faker (~> 2.16)
discourse_image_optim (0.26.2) discourse_image_optim (0.26.2)
exifr (~> 1.2, >= 1.2.2) exifr (~> 1.2, >= 1.2.2)

6
lib/js_locale_helper.rb
View File

@ -3,9 +3,9 @@
module JsLocaleHelper module JsLocaleHelper
def self.plugin_client_files(locale_str) def self.plugin_client_files(locale_str)
I18n::Backend::DiscourseI18n.sort_locale_files( files = Dir["#{Rails.root}/plugins/*/config/locales/client*.#{locale_str}.yml"]
Dir["#{Rails.root}/plugins/*/config/locales/client*.#{locale_str}.yml"] files += DiscourseDev.client_locale_files(locale_str) if Rails.env.development?
) I18n::Backend::DiscourseI18n.sort_locale_files(files)
end end
def self.reloadable_plugins(locale_sym, ctx) def self.reloadable_plugins(locale_sym, ctx)

2
lib/plugin/instance.rb
View File

@ -94,6 +94,8 @@ class Plugin::Instance
metadata = Plugin::Metadata.parse(source) metadata = Plugin::Metadata.parse(source)
plugins << self.new(metadata, path) plugins << self.new(metadata, path)
end end
plugins << DiscourseDev.auth_plugin if Rails.env.development? && DiscourseDev.auth_plugin_enabled?
} }
end end