decidim-term_customizer 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8f9e3f710555dd727f7775a85fe880c7c2da3455eeefe32dec49cc5b2053d99
-  data.tar.gz: 1ca69a30f8f7f2165704e35b74c0406d3c7292af573703c43d2f48c1d5305791
+  metadata.gz: c56c7da03b27c3f194772872e09e573a25bf780149a6f1486baf8577fc991e6a
+  data.tar.gz: fc23655eee6230889d6f859458e5a46b8d636a09d61f8749cb186ada121c3f46
 SHA512:
-  metadata.gz: 48969c7c92155f9bd057da0982ed7b41f2b61332ccddf7d4ce6018925c6f827979ffeaebfec29b5d97e5c2d591759a29384405974ae2583043062adf6e4b5aa5
-  data.tar.gz: 026732b8429b8a48a9b8d38d43a9ad2bdbf4deb6822c7820afb065e9f79ba9f86904c379a63e4dd30b77b077762a88802248307288db06b8ab6a40a57ac64606
+  metadata.gz: a205919d276b877c7cbd4b94edf21e6bfebffd62d5c94f1a458cfe0d3147c11b92d14801e96bbb6dad02b37a4595fc02a4dfcdbec953b6b71e46e0ab45ef42f4
+  data.tar.gz: bd83fd4e13a93a15a71ba2dbffcfe23731d9c75541ff0bf76e930f933ed43db853457658fbc246702148c6873787266011c6cce8e54abbe2a838a6d146bcc0fa

data/README.md

@@ -27,9 +27,12 @@ Example use cases for this module:
 - Admin wants to change the term "debate" to "discussion" for all assemblies
   within the system.
 
-Currently using this gem requires a bit of technical knowledge in defining the
-terms to be customized. The admin needs to know or find out the translation keys
-for the terms to be customized.
+You can add the term customizations using either of the following methods:
+
+- Search the terms from all the system translations matching the term itself or
+  the translation keys. This method is available in the "Add multiple" view.
+- Add the term customizations for specific translation keys in case you have the
+  technical knowledge to find out the translation keys.
 
 ## Installation
 
@@ -62,7 +65,9 @@ To keep the gem up to date, you can use the commands above to also update it.
   active.
 - Save the set.
 - Add the translations to the set which you want to customize within the defined
-  scope.
+  scope. You can either add specific translation keys manually or search the
+  translations from all the system's translations using the translation terms or
+  keys.
 
 ## Contributing
 

data/app/controllers/decidim/term_customizer/admin/translation_sets_controller.rb

@@ -89,7 +89,7 @@ module Decidim
             next unless models.count.positive?
 
             manifest
-          end
+          end.compact
         end
 
         def set

data/app/controllers/decidim/term_customizer/admin/translations_controller.rb

@@ -9,6 +9,7 @@ module Decidim
         def index
           enforce_permission_to :read, :translation
           @translations = collection
+          @directory = TranslationDirectory.new(current_locale)
         end
 
         def new

data/app/forms/decidim/term_customizer/admin/translation_form.rb

@@ -31,7 +31,7 @@ module Decidim
           errors.add(:key, :taken) if translation_set && translation_set.translations.where(
             locale: I18n.locale,
             key: key
-          ).exists?
+          ).where.not(id: id).exists?
         end
       end
     end

data/app/views/decidim/term_customizer/admin/translations/index.html.erb

@@ -21,6 +21,7 @@
         <thead>
           <tr>
             <th><%= t("models.translations.fields.key", scope: "decidim.admin") %></th>
+            <th><%= t("models.translations.fields.original_term", scope: "decidim.admin") %></th>
             <th><%= t("models.translations.fields.term", scope: "decidim.admin") %></th>
             <th></th>
           </tr>
@@ -31,6 +32,9 @@
               <td>
                 <%= translation.key %>
               </td>
+              <td>
+                <%= @directory.translations.term(translation.key) %>
+              </td>
               <td>
                 <%= translation.value %>
               </td>

data/config/locales/en.yml

@@ -13,7 +13,8 @@ en:
         translations:
           fields:
             key: Key
-            term: Term
+            original_term: Original term
+            term: Customized term
       titles:
         translation_sets: Translation sets
         translations: Translations

data/config/locales/fi.yml

@@ -2,7 +2,7 @@ fi:
   decidim:
     admin:
       actions:
-        add_multiple_translations: Lisätä useita
+        add_multiple_translations: Lisää useita
         back: Takaisin
         new_translation_set: Uusi käännöspaketti
         new_translation: Uusi käännös
@@ -13,7 +13,8 @@ fi:
         translations:
           fields:
             key: Avain
-            term: Termi
+            original_term: Alkuperäinen termi
+            term: Kustomoitu termi
       titles:
         translation_sets: Käännöspaketit
         translations: Käännökset

data/config/locales/sv.yml

@@ -13,7 +13,8 @@ sv:
         translations:
           fields:
             key: Key
-            term: Term
+            original_term: Original term
+            term: Customized term
       titles:
         translation_sets: Translation sets
         translations: Translations

data/lib/decidim/term_customizer/translation_store.rb

@@ -7,6 +7,10 @@ module Decidim
         @values = flat_hash(hash || {})
       end
 
+      def term(key)
+        @values[key]
+      end
+
       def by_key(search)
         @values.select do |key|
           includes_string?(key, search, case_sensitive: true)

data/lib/decidim/term_customizer/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module TermCustomizer
-    VERSION = "0.16.0"
+    VERSION = "0.16.1"
     DECIDIM_VERSION = "~> 0.16.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-term_customizer
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Antti Hukkanen