diff options
| -rw-r--r-- | app/views/calendars/_filters.html.slim | 12 | ||||
| -rw-r--r-- | app/views/calendars/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/calendars/show.html.slim | 9 | ||||
| -rw-r--r-- | config/locales/calendars.en.yml | 8 | ||||
| -rw-r--r-- | config/locales/calendars.fr.yml | 4 |
5 files changed, 20 insertions, 15 deletions
diff --git a/app/views/calendars/_filters.html.slim b/app/views/calendars/_filters.html.slim index 4d664c358..5317c433f 100644 --- a/app/views/calendars/_filters.html.slim +++ b/app/views/calendars/_filters.html.slim @@ -1,7 +1,7 @@ = search_form_for @q, url: workgroup_calendars_path(@workgroup), builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f| .ffg-row - .input-group.search_bar class=filter_item_class(params[:q], :name_cont) - = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...' + .input-group.search_bar class=filter_item_class(params[:q], :name_or_short_name_cont) + = f.search_field :name_or_short_name_cont, class: 'form-control', placeholder: I18n.t('calendars.filters.name_or_short_name_cont') span.input-group-btn button.btn.btn-default#search_btn type='submit' span.fa.fa-search @@ -10,13 +10,13 @@ .form-group.togglable class=filter_item_class(params[:q], :shared_true) = f.label Calendar.human_attribute_name(:shared), required: false, class: 'control-label' .form-group.checkbox_list - = f.input :shared_true, as: :boolean, label: ("<span>Oui</span>").html_safe, wrapper_html: { class: 'checkbox-wrapper' } - = f.input :shared_false, as: :boolean, label: ("<span>Non</span>").html_safe, wrapper_html: { class: 'checkbox-wrapper' } + = f.input :shared_true, as: :boolean, label: ("<span>#{I18n.t('yes')}</span>").html_safe, wrapper_html: { class: 'checkbox-wrapper' } + = f.input :shared_false, as: :boolean, label: ("<span>#{I18n.t('no')}</span>").html_safe, wrapper_html: { class: 'checkbox-wrapper' } .form-group class=filter_item_class(params[:q], :contains_date) = f.label Calendar.human_attribute_name(:date), class: 'control-label' = f.input :contains_date, as: :date, label: false, wrapper_html: { class: 'date smart_date' }, class: 'form-control', include_blank: true .actions - = link_to 'Effacer', workgroup_calendars_path(@workgroup), class: 'btn btn-link' - = f.submit 'Filtrer', id: 'calendar_filter_btn', class: 'btn btn-default' + = link_to I18n.t('actions.erase'), workgroup_calendars_path(@workgroup), class: 'btn btn-link' + = f.submit I18n.t('actions.filter'), id: 'calendar_filter_btn', class: 'btn btn-default' diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim index d4b84fe82..2c87a6f7a 100644 --- a/app/views/calendars/index.html.slim +++ b/app/views/calendars/index.html.slim @@ -35,6 +35,6 @@ - unless @calendars.any? .row.mt-xs .col-lg-12 - = replacement_msg t('calendars.search_no_results') + = replacement_msg t('.search_no_results') = javascript_pack_tag 'date_filters' diff --git a/app/views/calendars/show.html.slim b/app/views/calendars/show.html.slim index fa1ab3b71..648c98928 100644 --- a/app/views/calendars/show.html.slim +++ b/app/views/calendars/show.html.slim @@ -6,10 +6,11 @@ .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 = definition_list t('metadatas'), - { Calendar.human_attribute_name(:shared) => t("#{resource.shared}"), - 'Organisation' => resource.organisation.name, - Calendar.human_attribute_name(:dates) => resource.dates.collect{|d| l(d, format: :short)}.join(', ').html_safe, - Calendar.human_attribute_name(:date_ranges) => resource.periods.map{|d| t('validity_range', debut: l(d.begin, format: :short), end: l(d.end, format: :short))}.join('<br>').html_safe } + { Calendar.tmf('short_name') => resource.try(:short_name), + Calendar.tmf('shared') => t("#{resource.shared}"), + Calendar.tmf('organisation') => resource.organisation.name, + Calendar.tmf('dates') => resource.dates.collect{|d| l(d, format: :short)}.join(', ').html_safe, + Calendar.tmf('date_ranges') => resource.periods.map{|d| t('validity_range', debut: l(d.begin, format: :short), end: l(d.end, format: :short))}.join('<br>').html_safe } - if has_feature?('application_days_on_calendars') .row diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml index b9540d124..2d1033f48 100644 --- a/config/locales/calendars.en.yml +++ b/config/locales/calendars.en.yml @@ -1,5 +1,7 @@ en: calendars: + filters: + name_or_short_name_cont: Search by name/short name search_no_results: 'No calendar matching your query' days: monday: M @@ -37,7 +39,7 @@ en: all: All shared: Shared not_shared: Not shared - search_no_results: No calendar matching your query + search_no_results: No calendar templates matching your query date: Date new: title: Add a new calendar @@ -59,8 +61,8 @@ en: activerecord: models: calendar: - one: calendar - other: calendars + one: calendar template + other: calendar templates attributes: calendar: name: Name diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml index 6a87a889a..f3bcf7c3d 100644 --- a/config/locales/calendars.fr.yml +++ b/config/locales/calendars.fr.yml @@ -1,6 +1,8 @@ fr: calendars: - search_no_results: 'Aucun calendrier ne correspond à votre recherche' + filters: + name_or_short_name_cont: 'Indiquez un nom/nom court de calendrier...' + no_results: 'Aucun calendrier ne correspond à votre recherche' days: monday: L tuesday: Ma |