decidim-term_customizer 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16eec8f526df47ea82ef79a644e4afd290f64e7e1f7aa2fea64723ad7a30d6b9
-  data.tar.gz: 93c4464c8c3e2b3437df94b25e0f457e60ad1f18240c1fbc6609421600888805
+  metadata.gz: 966d2f30474a9b53bbdc7ae485ea6a726a550c4cdc111329257f259ba3eca5ee
+  data.tar.gz: 0fec267d0fbe868fac3840aefa9843456974662eebf5701a0689de0c509c3203
 SHA512:
-  metadata.gz: 4efdea5c3cca3ec8cd9f1e4d068b63f587b84f1ec9c175f9be2d1ff5832b688c467655596fcc85be7d2c2d6f22acffcf3c07913910c6a74151a4b5e4bb35aff6
-  data.tar.gz: 8864a676c3562377cc114556c058cbe50983d4b4691f9007130de45d3addbc8bb0ab4dd670c11e2a1412e53b748f06a06b78d23f652b379808ee499be24ce99c
+  metadata.gz: aa686d4635bf8f37c1eab0a6e4d3e794be3d5ab9623de5763e29d6f40036e99563722a206e2f3532bbd2e1ff3ce30efd824cd9f41c04c3e029cb8566f9b141ec
+  data.tar.gz: 5d760d7ea2ba5f43a8c20e5f4836ecc9c9443f1c3a68d0b667748233e1a71bcde0cf5b89341ecf742edc44c6fe76ba3f2d2791fe62e5d31133e813652110777a

data/Rakefile

@@ -38,11 +38,3 @@ task :development_app do
   install_module("development_app")
   seed_db("development_app")
 end
-
-# Run all tests, include all
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.verbose = false
-end
-
-# Run both by default
-task default: [:spec]

data/app/assets/config/translation_sets_admin_manifest.js

@@ -1,2 +1,3 @@
 //= link decidim/term_customizer/admin/translation_sets_admin.js
 //= link decidim/term_customizer/admin/translations_admin.js
+//= link decidim/term_customizer/admin/translations_admin_bulk.js

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

@@ -60,7 +60,7 @@ module Decidim
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("translation_sets.update.invalid", scope: "decidim.term_customizer.admin")
+              flash.now[:alert] = I18n.t("translation_sets.update.error", scope: "decidim.term_customizer.admin")
               render action: "edit"
             end
           end
@@ -75,17 +75,6 @@ module Decidim
           redirect_to translation_sets_path
         end
 
-        def export
-          enforce_permission_to :export, :translation_set, translation_set: set
-          name = "set-translations"
-
-          ExportJob.perform_later(current_user, set, name, params[:format] || "json")
-
-          flash[:notice] = I18n.t("exports.notice", scope: "decidim.admin")
-
-          redirect_to translation_set_translations_path(set)
-        end
-
         private
 
         def sets

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

@@ -59,7 +59,7 @@ module Decidim
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("translations.update.invalid", scope: "decidim.term_customizer.admin")
+              flash.now[:alert] = I18n.t("translations.update.error", scope: "decidim.term_customizer.admin")
               render action: "edit"
             end
           end
@@ -79,6 +79,17 @@ module Decidim
           redirect_to translation_set_translations_path(set)
         end
 
+        def export
+          enforce_permission_to :export, :translation_set, translation_set: set
+          name = "set-translations"
+
+          ExportJob.perform_later(current_user, set, name, params[:format] || "json")
+
+          flash[:notice] = I18n.t("exports.notice", scope: "decidim.admin")
+
+          redirect_to translation_set_translations_path(set)
+        end
+
         def new_import
           enforce_permission_to :import, :translation_set, translation_set: set
 

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

@@ -20,7 +20,7 @@ module Decidim
 
           @translations ||= translation_set.translations.where(
             key: translation_keys
-          )
+          ).order(:id)
         end
 
         # Only the translations passed with the IDs (current locale).
@@ -28,8 +28,8 @@ module Decidim
           return [] unless translation_set
 
           @translations_current ||= translation_set.translations.where(
-            id: translation_ids
-          ).uniq
+            id: translation_ids.uniq
+          ).order(:id)
         end
 
         private

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

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
-        <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+        <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
         &gt;
         <%= link_to translated_attribute(set.name), translation_set_translations_path(set) %>
         &gt;

data/app/views/decidim/term_customizer/admin/translation_sets/_form.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
-        <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+        <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
         &gt;
         <%= t "translation_sets.form.title", scope: "decidim.term_customizer.admin" %>
 
@@ -14,7 +14,7 @@
 
       <div class="flex--cc flex-gap--1">
         <div id="js-other-actions-wrapper">
-          <%= link_to t("actions.back", scope: "decidim.term_customizer.admin"), root_path, class: "button hollow tiny button--simple" %>
+          <%= link_to t("actions.back", scope: "decidim.term_customizer.admin"), translation_sets_path, class: "button hollow tiny button--simple" %>
         </div>
       </div>
     </h2>

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

@@ -38,6 +38,10 @@
                   <% end %>
                 </td>
                 <td class="table-list__actions">
+                  <% if allowed_to? :read, :translation %>
+                    <%= icon_link_to "eye", translation_set_translations_path(set), t("actions.view", scope: "decidim.term_customizer.admin"), class: "action-icon--show" %>
+                  <% end %>
+
                   <% if allowed_to? :update, :translation_set, translation_set: set %>
                     <%= icon_link_to "pencil", edit_translation_set_path(set), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
                   <% end %>

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

@@ -2,7 +2,7 @@
 <div class="dropdown-pane" id="export-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% %w{CSV JSON Excel}.each do |format| %>
-      <li class="exports--format--<%= format.downcase %> exports--translations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.term_customizer.admin.titles.translations"), export_format: format.upcase), export_translation_set_path(set, format: format), method: :post %></li>
+      <li class="exports--format--<%= format.downcase %> exports--translations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.term_customizer.admin.titles.translations"), export_format: format.upcase), export_translation_set_translations_path(set, format: format), method: :post %></li>
     <% end %>
   </ul>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
-        <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+        <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
         &gt;
         <%= link_to translated_attribute(set.name), translation_set_translations_path(set) %>
         &gt;

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

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
-        <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+        <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
         &gt;
         <%= translated_attribute(set.name) %>
 
@@ -20,7 +20,7 @@
           <% if allowed_to? :import, :translation_set, translation_set: set %>
             <%= link_to t("actions.import", scope: "decidim.term_customizer.admin"), import_translation_set_translations_path(set), class: "button tiny button--simple" %>
           <% end %>
-          <% if allowed_to? :export, :translation_set, translation_set: set %>
+          <% if set.translations.count > 0 && allowed_to?(:export, :translation_set, translation_set: set) %>
             <%= render partial: "export_dropdown" %>
           <% end %>
         </div>

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

@@ -3,7 +3,7 @@
     <div class="card-divider">
       <h2 class="card-title flex--sbc">
         <div>
-          <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+          <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
           &gt;
           <%= link_to translated_attribute(set.name), translation_set_translations_path(set) %>
           &gt;

data/app/views/decidim/term_customizer/admin/translations_destroys/new.html.erb

@@ -3,7 +3,7 @@
     <div class="card-divider">
       <h2 class="card-title flex--sbc">
         <div>
-          <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+          <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
           &gt;
           <%= link_to translated_attribute(set.name), translation_set_translations_path(set) %>
           &gt;

data/config/locales/ca.yml

@@ -30,6 +30,7 @@ ca:
           import: Import
           new_translation: Nova traducció
           new_translation_set: Nou set/joc de traducció
+          view: View
         add_translations:
           index:
             add: Afegir
@@ -70,7 +71,7 @@ ca:
             constraint_help_title: What are constraints?
             help_html: <p>A translation set is a "container" that holds the translations for a specific context you want to customize.</p> <p>Translation sets help you to organize your customizations and apply them to different contexts. This allows you to customize the same translation differently in different contexts.</p> <p>For example, if you want to customize a button with the term "Add" differently for different participatory processes, you can create separate translation sets for both processes and apply the set to those processes using the constraints.</p>
             help_title: What is a translation set?
-            title: Translation set.
+            title: Set/Joc de traducció
           index:
             no_records_html: <p>No translation sets available.</p> <p>Start by adding a translation set from the "<a href="%{new_set_link}">%{button_name}</a>" button.</p>
           new:

data/config/locales/en.yml

@@ -31,6 +31,7 @@ en:
           import: Import
           new_translation: New translation
           new_translation_set: New translation set
+          view: View
         add_translations:
           index:
             add: Add
@@ -94,7 +95,7 @@ en:
               processes, you can create separate translation sets for both processes
               and apply the set to those processes using the constraints.</p>
             help_title: What is a translation set?
-            title: Translation set.
+            title: Translation set
           index:
             no_records_html: <p>No translation sets available.</p> <p>Start by adding
               a translation set from the "<a href="%{new_set_link}">%{button_name}</a>"

data/config/locales/es.yml

@@ -30,6 +30,7 @@ es:
           import: Import
           new_translation: Nueva traducción
           new_translation_set: Nuevo grupo de traducciones
+          view: View
         add_translations:
           index:
             add: Añadir
@@ -70,7 +71,7 @@ es:
             constraint_help_title: What are constraints?
             help_html: <p>A translation set is a "container" that holds the translations for a specific context you want to customize.</p> <p>Translation sets help you to organize your customizations and apply them to different contexts. This allows you to customize the same translation differently in different contexts.</p> <p>For example, if you want to customize a button with the term "Add" differently for different participatory processes, you can create separate translation sets for both processes and apply the set to those processes using the constraints.</p>
             help_title: What is a translation set?
-            title: Translation set.
+            title: Grupo de traducciones
           index:
             no_records_html: <p>No translation sets available.</p> <p>Start by adding a translation set from the "<a href="%{new_set_link}">%{button_name}</a>" button.</p>
           new:

data/config/locales/fi.yml

@@ -30,6 +30,7 @@ fi:
           import: Tuo
           new_translation: Uusi käännös
           new_translation_set: Uusi käännöspaketti
+          view: Näytä
         add_translations:
           index:
             add: Lisää
@@ -70,7 +71,7 @@ fi:
             constraint_help_title: Mitä ovat rajaussäännöt?
             help_html: <p>Käännöspaketti, on "paketti", joka sisältää käännöksiä tietylle kontekstille, jonka termejä haluat muuttaa.</p><p>Käännöspaketit auttavat sinua pitämään kustomointisi järjestyksessä ja rajaamaan niitä tiettyihin konteksteihin. Tämä mahdollistaa sen, että voit esimerkiksi muuttaa saman termin eri tavalla sivuston eri paikoissa.</p><p>Mikäli haluat esimerkiski muuttaa "Lisää" -napin tekstin erilaiseksi eri prosesseille, voit luoda kaksi erillistä käännöspakettia molempia prosesseja varten. Molemmat paketit rajataan kyseisiin prosesseihin rajaussääntöjen avulla.</p>
             help_title: Mikä on käännöspaketti?
-            title: Käännöspaketti.
+            title: Käännöspaketti
           index:
             no_records_html: <p>Ei käännöspaketteja.</p><p>Aloita lisäämällä käännöspaketti "<a href="%{new_set_link}">%{button_name}</a>" -napin avulla.</p>
           new:

data/config/locales/fr.yml

@@ -30,6 +30,7 @@ fr:
           import: Import
           new_translation: Nouvelle traduction
           new_translation_set: Nouveau jeu de traduction
+          view: View
         add_translations:
           index:
             add: Ajouter
@@ -63,14 +64,14 @@ fr:
             success: Le jeu de traduction a été supprimé.
           edit:
             save: Sauvegarder
-            title: Jeu de traduction
+            title: Jeu de traductions
           form:
             add_constraint: Ajouter contrainte
             constraint_help_html: <p>Constraints are specific rules that allow you to apply the customizations in a set to a specific context.</p> <p>In case you do not define any constraint rules, the customizations in this set will apply to the whole application. On the other hand, if you want the customizations in this set to apply only to a specific process, select "Participatory processes" as the participatory space type and the target process as the participatory space. Furthermore, you can also apply the customizations to a specific component by defining the component for the constraint.</p> <p>If you define multiple constraints, the customizations will apply in all of those.</p>
             constraint_help_title: What are constraints?
             help_html: <p>A translation set is a "container" that holds the translations for a specific context you want to customize.</p> <p>Translation sets help you to organize your customizations and apply them to different contexts. This allows you to customize the same translation differently in different contexts.</p> <p>For example, if you want to customize a button with the term "Add" differently for different participatory processes, you can create separate translation sets for both processes and apply the set to those processes using the constraints.</p>
             help_title: What is a translation set?
-            title: Translation set.
+            title: Jeu de traductions
           index:
             no_records_html: <p>No translation sets available.</p> <p>Start by adding a translation set from the "<a href="%{new_set_link}">%{button_name}</a>" button.</p>
           new:

data/config/locales/sv.yml

@@ -30,6 +30,7 @@ sv:
           import: Import
           new_translation: New translation
           new_translation_set: New translation set
+          view: View
         add_translations:
           index:
             add: Add
@@ -70,7 +71,7 @@ sv:
             constraint_help_title: What are constraints?
             help_html: <p>A translation set is a "container" that holds the translations for a specific context you want to customize.</p> <p>Translation sets help you to organize your customizations and apply them to different contexts. This allows you to customize the same translation differently in different contexts.</p> <p>For example, if you want to customize a button with the term "Add" differently for different participatory processes, you can create separate translation sets for both processes and apply the set to those processes using the constraints.</p>
             help_title: What is a translation set?
-            title: Translation set.
+            title: Translation set
           index:
             no_records_html: <p>No translation sets available.</p> <p>Start by adding a translation set from the "<a href="%{new_set_link}">%{button_name}</a>" button.</p>
           new:

data/lib/decidim/term_customizer/admin_engine.rb

@@ -10,12 +10,9 @@ module Decidim
 
       routes do
         resources :translation_sets, path: :sets, except: [:show] do
-          member do
-            post :export
-          end
-
           resources :translations, except: [:show] do
             collection do
+              post :export
               get :import, action: :new_import
               post :import
               resource :translations_destroy, only: [:new, :destroy]

data/lib/decidim/term_customizer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-term_customizer
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin