rodauth-i18n 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 017c38a897546999927ec0acb752e2e5315bc895199ec95cdde3f2fd1b5ae85d
-  data.tar.gz: 3173ef8d111825aea4e7f48433e72ad6b3dcfd1cf0453e6cb7f2e7a024903452
+  metadata.gz: ff0034b4e6b28f5822ecc9ee1698ab728995e0e063f78dbfbf0c9e8d0d819a84
+  data.tar.gz: 61899a57abb184b686676a27a215c89098a47b747801a02b651f097179055332
 SHA512:
-  metadata.gz: cc1047e0a25041e178c839b680070352265d0aaf355b008912fac23f70ec17b4cbf7b8b663d95383cddecfe61f4f9a31818d1ddb6bf861fe72c74423882b487d
-  data.tar.gz: 5a83eb687df9fb3080edea0fbc00079bb5b59b4d7c5c10a6e0507c25222dfa2bf13075be6c7110dcf3233295df817e3c87d9d6240d270978f5f5368694d7ecef
+  metadata.gz: 539e08db905e57c51b88d0b4619d9d330ec279dbb843dd4d042f2bfd20c81bcbd2d76a88b11e3796f4f0e37046467399547a5c97cf24a647d7dc660a18e11e77
+  data.tar.gz: b16c1407a6e3887297c52c938e4e4f1f0cf80db6e0a9f6d13390258130e67200969e82ea538e343c0944818d79fa8eeda400011e8fbfda21e3dc9ae7569fdd32

data/README.md

@@ -9,7 +9,7 @@ It also includes built-in translations for various languages, which you are enco
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "rodauth-i18n", "~> 0.2"
+gem "rodauth-i18n", "~> 0.3"
 ```
 
 And then execute:
@@ -82,6 +82,8 @@ $ rails generate rodauth:translations
 # imports translations for available locales
 ```
 
+Only translations for currently enabled Rodauth features will be imported. Re-running the generator will import translations for any newly enabled features, remove translations for any disabled features, and keep any existing translations unchanged.
+
 On other web frameworks, you can copy the translation files directly from the `locales/` directory.
 
 ### Raising on missing translations

data/lib/generators/rodauth/translations_generator.rb

@@ -1,4 +1,5 @@
-require "rails/generators/base"
+require "rails/generators"
+require "active_support/core_ext/hash/slice"
 
 module Rodauth
   module Rails
@@ -10,17 +11,69 @@ module Rodauth
         desc: "List of locales to copy translation files for"
 
       def copy_locales
+        say "No locales specified!", :yellow if locales.empty?
+
         locales.each do |locale|
-          copy_file("#{locale}.yml", "config/locales/rodauth.#{locale}.yml")
-        end
+          translations = retrieve_translations(locale)
 
-        say "No locales specified!", :yellow if locales.empty?
+          if translations.empty?
+            say "No translations for locale: #{locale}", :yellow
+            next
+          end
+
+          # retain translations the user potentially changed
+          translations.merge!(existing_translations(locale))
+          # keep only translations for currently enabled features
+          translations.slice!(*rodauth_methods)
+
+          create_file "config/locales/rodauth.#{locale}.yml", locale_content(locale, translations)
+        end
       end
 
       private
 
+      def retrieve_translations(locale)
+        files = translation_files(locale)
+        files.inject({}) do |translations, file|
+          translations.merge YAML.load_file(file)[locale]["rodauth"]
+        end
+      end
+
+      def existing_translations(locale)
+        destination = File.join(destination_root, "config/locales/rodauth.#{locale}.yml")
+
+        # try to load existing translations first
+        if File.exist?(destination)
+          YAML.load_file(destination)[locale]["rodauth"]
+        else
+          {}
+        end
+      end
+
+      def translation_files(locale)
+        # ensure Rodauth configuration ran in autoloaded environment
+        Rodauth::Rails.app
+
+        Rodauth::I18n.directories
+          .map { |directory| Dir["#{directory}/#{locale}.yml"] }
+          .inject(:+)
+      end
+
+      def rodauth_methods
+        rodauths
+          .flat_map { |rodauth| rodauth.instance_methods - Object.instance_methods }
+          .map(&:to_s)
+          .sort
+      end
+
+      def locale_content(locale, translations)
+        data = { locale => { "rodauth" => translations } }
+        yaml = YAML.dump(data, line_width: 10_000) # disable line wrapping
+        yaml.split("\n", 2).last # remove "---" header
+      end
+
       def locales
-        selected_locales || available_locales
+        selected_locales || available_locales.map(&:to_s)
       end
 
       def available_locales

data/lib/rodauth/features/i18n.rb

@@ -1,3 +1,4 @@
+require "set"
 require "i18n"
 
 module Rodauth
@@ -16,6 +17,12 @@ module Rodauth
       :i18n_locale,
     )
 
+    @directories = Set.new
+
+    class << self
+      attr_reader :directories
+    end
+
     def post_configure
       super
       i18n_register File.expand_path("#{__dir__}/../../../locales")
@@ -61,6 +68,7 @@ module Rodauth
       files = i18n_files(directory)
       files.each { |file| i18n_add(file) }
       i18n_reload
+      Rodauth::I18n.directories << directory
     end
 
     # Returns list of translation files in given directory based on

data/rodauth-i18n.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rodauth-i18n"
-  spec.version       = "0.3.0"
+  spec.version       = "0.3.1"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko@hey.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rodauth