diff --git a/Gemfile b/Gemfile index 4127ede86..c515b2d96 100644 --- a/Gemfile +++ b/Gemfile @@ -38,8 +38,6 @@ gem 'kaminari' # Decorators gem 'draper' -gem 'unicode_utils' - # Gestion des comptes utilisateurs gem 'devise' gem 'devise-async' diff --git a/Gemfile.lock b/Gemfile.lock index 110b9c397..a91fc5d90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -746,7 +746,6 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicode_utils (1.4.0) unicorn (5.4.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -866,7 +865,6 @@ DEPENDENCIES turbolinks typhoeus uglifier - unicode_utils unicorn vcr warden! diff --git a/app/views/dossiers/_edit_carto.html.haml b/app/views/dossiers/_edit_carto.html.haml index 8d2e5dc9b..85567d5b2 100644 --- a/app/views/dossiers/_edit_carto.html.haml +++ b/app/views/dossiers/_edit_carto.html.haml @@ -2,4 +2,4 @@ - if user_signed_in? && (@facade.dossier.owner_or_invite?(current_user)) %a#maj_carte.action{ href: "/users/dossiers/#{@facade.dossier.id}/carte" } .col-lg-2.col-md-2.col-sm-2.col-xs-2.action - = 'éditer'.upcase + = 'ÉDITER' diff --git a/app/views/dossiers/_edit_dossier.html.haml b/app/views/dossiers/_edit_dossier.html.haml index eecc8aab9..14e3800cd 100644 --- a/app/views/dossiers/_edit_dossier.html.haml +++ b/app/views/dossiers/_edit_dossier.html.haml @@ -2,4 +2,4 @@ - if user_signed_in? && (@facade.dossier.owner_or_invite?(current_user)) = link_to modifier_dossier_path(@facade.dossier), class: 'action', id: 'maj_infos' do #edit-dossier.col-lg-2.col-md-2.col-sm-2.col-xs-2.action - = "éditer".upcase + = "ÉDITER" diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index d5e0f1ec1..0677e67e3 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -3,7 +3,7 @@ - if @facade.procedure.for_individual? .row.title-row .col-xs-4.split-hr - .col-xs-4.dossier-title= t('utils.depositaire').upcase + .col-xs-4.dossier-title= t('utils.depositaire') .col-xs-4.split-hr .row .col-xs-6.depositaire-label Civilité @@ -29,7 +29,7 @@ - if champ.type_champ == 'header_section' .row.title-row.margin-top-40 .col-xs-3.split-hr - .col-xs-6.dossier-title= champ.libelle.upcase + .col-xs-6.dossier-title= champ.libelle .col-xs-3.split-hr - else .row @@ -60,7 +60,7 @@ .col-xs-12 .row.title-row .col-xs-4.split-hr - .col-xs-4.dossier-title= t('utils.pieces').upcase + .col-xs-4.dossier-title= t('utils.pieces') .col-xs-4.split-hr .col-xs-12#pieces-justificatives.margin-bot-40 diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml index 68291d6d5..362576da5 100644 --- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml @@ -2,7 +2,7 @@ .en-cours %b = dossier_count = current_administrateur.procedures.count - = ("Procedures".pluralize(dossier_count)).upcase + = "Procedures".pluralize(dossier_count) #action-block diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml index 83c65aa77..31ad41f26 100644 --- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml @@ -1,7 +1,7 @@ #first-block .en-cours = dossier_count = current_user.dossiers.count - = ("Dossier".pluralize(dossier_count)).upcase + = "Dossier".pluralize(dossier_count) %br EN COURS diff --git a/config/initializers/stringupcasepatch.rb b/config/initializers/stringupcasepatch.rb deleted file mode 100644 index 39d2e107a..000000000 --- a/config/initializers/stringupcasepatch.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "unicode_utils/upcase" - -class String - def upcase - UnicodeUtils.upcase(self) - end -end