diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb index 281d0753..b0f6c63c 100644 --- a/app/views/admin/ad_banners/_ad_image_update.html.erb +++ b/app/views/admin/ad_banners/_ad_image_update.html.erb @@ -2,7 +2,7 @@ <%= image_tag ad_image.file rescue nil%>

<%= ad_image.display? ? "[#{t('ad.showing')}]" : "[#{t('ad.not_showing')}]" %> - <%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %> + <%= "#{ad_image.post_date} ~ #{ad_image.unpost_date}" %>

<%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>

diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index 8da7800f..a925b40b 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -15,8 +15,8 @@

<%= t(:date_) %>

- <%= f.datetime_picker :post_date, :picker_type => 'date', :label => t(:start_date), :icon_date => "icons-cross-3 icon-spin" %> - <%= f.datetime_picker :unpost_date, :picker_type => 'separated', :label => t(:end_date) %> + <%= f.datetime_picker :post_date, :picker_type => 'date', :label => t(:start_date) %> + <%= f.datetime_picker :unpost_date, :picker_type => 'date', :label => t(:end_date) %>
diff --git a/config/locales/picker.zh_tw.yml b/config/locales/picker.zh_tw.yml index f92f47b0..1bedaa99 100644 --- a/config/locales/picker.zh_tw.yml +++ b/config/locales/picker.zh_tw.yml @@ -1,4 +1,4 @@ -en: +zh_tw: datetime_picker: date: