active_scaffold 3.6.4 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2aecb1c0513a318aeaa726f5c077b7b8f31608861890f316615187e6e53e7a8
-  data.tar.gz: de1535be3e41666fcf2e7a9a50b61a39d328466f3094a8d0089a83fe8ab56c98
+  metadata.gz: db4ded41b22bcb1ff0c1f9d2e59499bd37127ffc4600e53fc24856a9ef525897
+  data.tar.gz: e3b57c93d2250d0ac83f618ee38c04b8514d56817555bace633a2a9efb05d3ed
 SHA512:
-  metadata.gz: 29d77b4bdf5901be5b856242aee5a511208541dd7ef70e83e06ad0c411999406ab39e4bfe2ed864ed88da8d0aa7369df023b823f00be9dfdfa87a0e6b44e06e4
-  data.tar.gz: e00f0ade90a6a1a4e62f7b3590bd039aed8d8b5d9a00f9d6d1e12d68662aed6be672aec16563bd5014bda61810e3cedcbbb178070b052e2f8a5eb26bbc46b2b9
+  metadata.gz: c1a48c8654117d2829cdde939ab632b797287312dfe37fe88d73594b70ef2d48b4cac5872158fb56a090808daa6334310ab3ac8efc73de0109850760ed5673ee
+  data.tar.gz: 58052fce6e32e54e28cc3d77c43f2a952b32be8c6a314a07047537a1d3c62931476d30c787a0cd239329c099e8dbdff6032d31610fb93cd83e79192ec27c192d

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+= 3.6.6
+- Fix format string for timezone in jquery timepicker
+
+= 3.6.5
+- Support timezone in jquery timepicker
+
+= 3.6.4.1
+- Actually fix country_select bridge for latest gem version
+
 = 3.6.4
 - Fix country_select bridge for latest gem version
 
@@ -45,7 +54,7 @@
 - Display loading indicator at bottom on auto pagination
 - List rendering speed up
 - Remove font family from CSS, it was preventing from changing it easily in body
-- Fix search for mongoid models in with threadsafety enabled
+- Fix search for mongoid models with threadsafety enabled
 - Keep nested params after calling render_field for column in subform
 - Fix nested for controllers without list action (for example, for nested create on singular assocations)
 - Fix delayed setup issues with threads

data/config/locales/de.yml

@@ -41,6 +41,7 @@ de:
       closeText: Schließen
       currentText: Jetzt
       timeText: Uhrzeit
+      timezoneText: Timezone
     days: Tage
     delete: Löschen
     deleted_model: "%{model} gelöscht"

data/config/locales/en.yml

@@ -41,6 +41,7 @@ en:
       closeText: Close
       currentText: Now
       timeText: Hour
+      timezoneText: Timezone
     days: Days
     delete: Delete
     deleted_model: Deleted %{model}

data/config/locales/es.yml

@@ -41,6 +41,7 @@ es:
       closeText: Cerrar
       currentText: Ahora
       timeText: Hora
+      timezoneText: Zona horaria
     days: Días
     delete: Borrar
     deleted_model: "%{model} borrado"

data/config/locales/fr.yml

@@ -41,6 +41,7 @@ fr:
       closeText: Fermer
       currentText: Maintenant
       timeText: Heure
+      timezoneText: Timezone
     days: Jours
     delete: Supprimer
     deleted_model: Suppression de %{model}

data/config/locales/hu.yml

@@ -40,7 +40,8 @@ hu:
     datetime_picker_options:
       closeText: 
       currentText: 
-      timeText: 
+      timeText:
+      timezoneText: Timezone
     days: Days
     delete: Törlés
     deleted_model: "%{model} törölve"

data/config/locales/ja.yml

@@ -40,7 +40,8 @@ ja:
     datetime_picker_options:
       closeText: 
       currentText: 
-      timeText: 
+      timeText:
+      timezoneText: Timezone
     days: Days
     delete: 削除
     deleted_model: "%{model}を削除しました"

data/config/locales/ru.yml

@@ -40,7 +40,8 @@ ru:
     datetime_picker_options:
       closeText: Закрыть
       currentText: Текущее время
-      timeText: 
+      timeText:
+      timezoneText: Timezone
     days: дней
     delete: Удалить
     deleted_model: "%{model}: запись удалена"

data/lib/active_scaffold/bridges/country_select/country_select_bridge_helper.rb

@@ -3,7 +3,7 @@ module ActiveScaffold::Bridges
     module FormColumnHelpers
       def active_scaffold_input_country(column, options)
         select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us]}
-        select_options[:format] = column.options[:format]
+        select_options[:format] = column.options[:format] if column.options[:format]
         select_options.merge!(options)
         options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
         active_scaffold_select_name_with_multiple options

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -18,7 +18,8 @@ module ActiveScaffold::Bridges
         /%M/ => 'mm',
         /%p/ => 'tt',
         /%S/ => 'ss',
-        /%[cUWwxXZz]/ => ''
+        /%z/ => 'z',
+        /%[cUWwxXZ]/ => ''
       }.freeze
 
       def self.date_options_for_locales
@@ -82,13 +83,14 @@ module ActiveScaffold::Bridges
 
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
-        if rails_format =~ /%[cUWwxXZz]/
+        unsupported = DATE_FORMAT_CONVERSION.index ''
+        if rails_format =~ unsupported
+          options = unsupported.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
           Rails.logger.warn(
             "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
             "which can't be converted to jquery datepicker format. "\
-            'Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed'
+            "Options #{options.join(', ')} are not supported by datepicker and will be removed"
           )
-          nil
         end
         js_format = rails_format.dup
         js_format.gsub!(/([ ]|^)([^% ]\S*)/, " '\\2'")

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 4
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.6
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails