active_scaffold 3.6.4.1 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335d7ad205e19c251d006398597bad619cc5499efa8a0815017cf27aa5df0b65
-  data.tar.gz: 940135dfbc68e1c3d70aa02132a3d9f3873162dc4964b6d9cdc04a2b73feed97
+  metadata.gz: 9669748f60be5817e4e654db635763351b986b914e85aff89d5b04b3f6ffe848
+  data.tar.gz: 55a24b6c7ef8e4ac5e517db0d559fbdba43ba055c6eaaa5a5c70e73baa935841
 SHA512:
-  metadata.gz: 436fed807f06fb66d908dd913a54f06173fb7304ebbb59ea15c0952165570c6fd16ba243794dc147140445beb9e03e9f6e28ca9564d5bedb402f28e2dbdd565e
-  data.tar.gz: 7dec63250eee9943823e9ffc14fd45ac7dd2edb5aef15f901a564ba0bc60101b93a41cfca09e58dd29936ef7aebe3e534adb9cfb850abdeb21bb88b7567b028d
+  metadata.gz: 16dddca354bfaf6dcaa405f4dacb89c402563d06df115dc74ffba41d39e9ff8dadebaf4ec9b63a2a2830f1887ad43f640bd0873fede81c392c96fa5e06b128ac
+  data.tar.gz: 0cc2b4014d79082b8d1f704913f1d22c4876072e3608ffef0dd27f38d237021ee607b280142ee0d5c4402020b3a9533eda56f19d6a0788d5ae27c18cc16ea073

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= 3.6.5
+- Support timezone in jquery timepicker
+
 = 3.6.4.1
 - Actually fix country_select bridge for latest gem version
 

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/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.1'
+    PATCH = 5
 
     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.1
+  version: 3.6.5
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery