From f651f540d70f0fb28ddcb83ed5d70cc15b7123c7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 15:57:13 +0100 Subject: [PATCH 1/3] fixes environment documentation --- CHANGELOG.md | 3 ++- doc/environment.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b43023b19..06ce7162d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,8 @@ - Added freeCAD files as default allowed extensions - Rake task to sync local users with Stripe - Unified translations syntax to use ICU MessageFormat -- Updated and refactored README +- Refactored front-end translations keys with unified paths +- Updated and refactored README and documentations - Fix a bug: unable to remove the picture from a training - Fix a bug: no alerts on errors during admin creation - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] diff --git a/doc/environment.md b/doc/environment.md index 23d962d94..2c435a529 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -325,7 +325,7 @@ Configure the first day of the week in your locale zone (generally monday or sun D3_DATE_FORMAT Date format for dates displayed in statistics charts. -See [D3 Wiki](https://github.com/mbostock/d3/wiki/Time-Formatting#format) for available formats. +See [D3 Wiki](https://github.com/d3/d3-time-format/blob/v2.2.2/README.md#locale_format) for available formats. UIB_DATE_FORMAT From bcd0e6833d0af8587384a55e022c0bf14952662b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 16:50:16 +0100 Subject: [PATCH 2/3] integrate crowdin in-context translation code --- app/views/application/index.html.erb | 7 + config/locales/ach.yml | 409 +++++++++++ config/locales/app.admin.ach.yml | 975 +++++++++++++++++++++++++++ config/locales/app.logged.ach.yml | 183 +++++ config/locales/app.public.ach.yml | 334 +++++++++ config/locales/app.shared.ach.yml | 417 ++++++++++++ config/locales/devise.ach.yml | 63 ++ config/locales/mails.ach.yml | 277 ++++++++ config/locales/rails.ach.yml | 205 ++++++ config/secrets.yml | 1 + doc/environment.md | 6 + 11 files changed, 2877 insertions(+) create mode 100644 config/locales/ach.yml create mode 100644 config/locales/app.admin.ach.yml create mode 100644 config/locales/app.logged.ach.yml create mode 100644 config/locales/app.public.ach.yml create mode 100644 config/locales/app.shared.ach.yml create mode 100644 config/locales/devise.ach.yml create mode 100644 config/locales/mails.ach.yml create mode 100644 config/locales/rails.ach.yml diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index b8885143e..9084e0b41 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -12,6 +12,13 @@ + <% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation == 'true' %> + + + <% end %>