simple_form_extension 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41f086cd052a4b616fbcd9329c43f943baf45da0
-  data.tar.gz: 121454242d3c9e3e9c80454e0e34e13de660c09b
+  metadata.gz: 40b76905f993c1d85fe6d87f2e13c042f985891b
+  data.tar.gz: edc4518dda7d58a0e2d8a3d6c3117f183a3f4b7a
 SHA512:
-  metadata.gz: 55d81b2f320d89a4a8dfc9c99e502c2609a68aa255997378e576e7e5724639eb9b80d42cf98f419039da57acb99398104b4b6a831f2dd69cb70a09bd4af3aabd
-  data.tar.gz: 2990f089af56a6811445738d9e6954f7bb880e4c77463d21c6606c7c97d6be3b485aaa243d19d05c3adff269207ca449a782dd4667af70921d309896c174527c
+  metadata.gz: daa96cc685910fe4514132b286881ddcd02992f0303c94f1cdcaf7d2d1aaa8f1dd11fc95a52bb3c6143879a382a16fc502498923b211927f97917be07d94f0a2
+  data.tar.gz: 01cbf739c86556795d51eb057d163b95347528192c8037b12f95fae7cd3706db1d9d1f036e487bccf6bad375ef1018046d2a529c43275e97f58f639a8b4757dc

data/lib/generators/simple_form_extension/templates/config/locales/simple_form_extension.en.yml

@@ -9,9 +9,13 @@ en:
         select: "Select image"
         change: "Change image"
       date:
-        format: 'm/d/Y'
+        format:
+          js: 'Y/m/d'
+          rails: '%Y/%m/%d'
       datetime:
-        format: 'm/d/Y H:i'
+        format:
+          js: 'Y/m/d H:i'
+          rails: '%Y/%m/%d %H:%M'
       shared:
         week_start_day: 0
       selectize:

data/lib/generators/simple_form_extension/templates/config/locales/simple_form_extension.fr.yml

@@ -9,9 +9,13 @@ fr:
         select: "Sélectionnez une image"
         change: "Changer"
       date:
-        format: 'd/m/Y'
+        format:
+          js: 'd/m/Y'
+          rails: '%d/%m/%Y'
       datetime:
-        format: 'd/m/Y H:i'
+        format:
+          js: 'd/m/Y H:i'
+          rails: '%d/%m/%Y %H:%M'
       shared:
         week_start_day: 1
       selectize:

data/lib/simple_form_extension/inputs/date_time_input.rb

@@ -3,24 +3,33 @@ module SimpleFormExtension
     class DateTimeInput < SimpleForm::Inputs::DateTimeInput
       include SimpleFormExtension::Translations
 
+      delegate :content_tag, to: :template
+
       def input(wrapper_options = nil)
       	input_html_options[:class] << "form-control"
 
         input_html_options[:data] ||= {}
         input_html_options[:data].merge!(
-          :'date-format' => _translate('date.format'),
-          :'datetime-format' => _translate('datetime.format'),
+          :'date-format' => _translate('date.format.js'),
+          :'datetime-format' => _translate('datetime.format.js'),
           :'week-start-day' => _translate('shared.week_start_day')
         )
 
-        "<div class=\"input-group\">
-          #{@builder.text_field(attribute_name, input_html_options)}
-          <span class=\"input-group-btn\">
-            <button type=\"button\" class=\"btn btn-default datetimepicker-trigger\">
-              <i class=\"fa fa-calendar\"></i>
-            </button>
-          </span>
-        </div> ".html_safe
+        if (value = object.send(attribute_name)) && !input_html_options.key?(:value)
+          format = _translate("#{ input_type }.format.rails")
+          input_html_options[:value] = I18n.l(value, format: format)
+        end
+
+
+        content_tag(:div, class: 'input-group') do
+          @builder.text_field(attribute_name, input_html_options) +
+
+          content_tag(:span, class: 'input-group-btn') do
+            content_tag(:button, class: 'btn btn-default datetimepicker-trigger') do
+              content_tag(:i, '', class: 'fa fa-calendar')
+            end
+          end
+        end
       end
     end
   end

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Alexandre Vasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails