From e08432ddde9268ff95567659999a552a271ba4b3 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <svkn.87@gmail.com>
Date: Fri, 16 Apr 2021 06:42:34 +0530
Subject: [PATCH] DEV: Bump discourse_dev to 0.1.0 (#12722)

And add the "discourse-development-auth" plugin and client locale files.
---
 Gemfile.lock            | 2 +-
 lib/js_locale_helper.rb | 6 +++---
 lib/plugin/instance.rb  | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 654c401207d..b7b99480c9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       railties (>= 3.1)
     discourse-ember-source (3.12.2.3)
     discourse-fonts (0.0.8)
-    discourse_dev (0.0.9)
+    discourse_dev (0.1.0)
       faker (~> 2.16)
     discourse_image_optim (0.26.2)
       exifr (~> 1.2, >= 1.2.2)
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 40614fbd0db..fbf1fc1bdb3 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -3,9 +3,9 @@
 module JsLocaleHelper
 
   def self.plugin_client_files(locale_str)
-    I18n::Backend::DiscourseI18n.sort_locale_files(
-      Dir["#{Rails.root}/plugins/*/config/locales/client*.#{locale_str}.yml"]
-    )
+    files = 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
 
   def self.reloadable_plugins(locale_sym, ctx)
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 9febcecb072..d8d8e6717c6 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -94,6 +94,8 @@ class Plugin::Instance
         metadata = Plugin::Metadata.parse(source)
         plugins << self.new(metadata, path)
       end
+
+      plugins << DiscourseDev.auth_plugin if Rails.env.development? && DiscourseDev.auth_plugin_enabled?
     }
   end