decidim-core 0.15.1 → 0.15.2

data/config/locales/uk.yml

@@ -9,7 +9,6 @@ uk:
         about: Про учасника
         email: Адреса вашої електронної пошти
         name: Ваше ім’я
-        nickname: Ваш короткий, унікальний псевдонім
         password: Пароль
         password_confirmation: Підтвердьте свій пароль
         personal_url: Особиста веб-адреса
@@ -28,11 +27,6 @@ uk:
         password_confirmation: Підтвердження паролю
         remember_me: Запам'ятати мене
     models:
-      decidim/user:
-        one: Учасник
-        few: Учасників
-        many: Учасників
-        other: Учасників
       decidim/user_group:
         one: Гурт учасників
         few: Гурти учасників
@@ -185,11 +179,6 @@ uk:
           ok: Гаразд
           title: Недостатньо прав через відсутність підтвердження особи
     collapsible_list:
-      hidden_elements_count:
-        one: і ще 1
-        few: і ще %{count}
-        many: і ще %{count}
-        other: і ще %{count}
       see_less: "(читати менше)"
       see_more: "(читати далі)"
     components:

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.15.1"
+      "0.15.2"
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -36,13 +36,7 @@ module Decidim
     #
     # Renders form fields for each locale.
     def translated(type, name, options = {})
-      if locales.count == 1
-        return send(
-          type,
-          "#{name}_#{locales.first.to_s.gsub("-", "__")}",
-          options.merge(label: options[:label] || label_for(name))
-        )
-      end
+      return translated_one_locale(type, name, locales.first, options.merge(label: (options[:label] || label_for(name)))) if locales.count == 1
 
       tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
 
@@ -72,7 +66,7 @@ module Decidim
           tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
           string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
             if options[:hashtaggable]
-              hashtaggable_text_field(type, name, locale, options)
+              hashtaggable_text_field(type, name, locale, options.merge(label: false))
             else
               send(type, name_with_locale(name, locale), options.merge(label: false))
             end
@@ -83,6 +77,15 @@ module Decidim
       safe_join [label_tabs, tabs_content]
     end
 
+    def translated_one_locale(type, name, locale, options = {})
+      return hashtaggable_text_field(type, name, locale, options.merge(value: options[:value])) if options[:hashtaggable]
+      send(
+        type,
+        "#{name}_#{locale.to_s.gsub("-", "__")}",
+        options.merge(label: options[:label] || label_for(name))
+      )
+    end
+
     # Public: Generates a field for hashtaggable type.
     # type - The form field's type, like `text_area` or `text_input`
     # name - The name of the field
@@ -93,9 +96,9 @@ module Decidim
     def hashtaggable_text_field(type, name, locale, options = {})
       content_tag(:div, class: "hashtags__container") do
         if options[:value]
-          send(type, name_with_locale(name, locale), options.merge(label: false, value: options[:value][locale]))
+          send(type, name_with_locale(name, locale), options.merge(label: options[:label], value: options[:value][locale]))
         else
-          send(type, name_with_locale(name, locale), options.merge(label: false))
+          send(type, name_with_locale(name, locale), options.merge(label: options[:label]))
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -690,28 +690,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1449,10 +1449,12 @@ files:
 - config/locales/es-PY.yml
 - config/locales/es.yml
 - config/locales/eu.yml
+- config/locales/fi-pl.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/gl.yml
 - config/locales/hu.yml
+- config/locales/id-ID.yml
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
@@ -1460,6 +1462,7 @@ files:
 - config/locales/pt.yml
 - config/locales/ru.yml
 - config/locales/sv.yml
+- config/locales/tr-TR.yml
 - config/locales/uk.yml
 - config/routes.rb
 - db/migrate/20160817115213_devise_create_decidim_users.rb
@@ -1795,7 +1798,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The core of the Decidim framework.