From 63934b7863d09ff5fd1af1d43d23eab31fa2ccdc Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 30 Jun 2020 15:28:59 +0100 Subject: [PATCH 1/2] Add space after translation so that translators dont have to guess a space is needed after the translation --- app/assets/javascripts/darkswarm/filters/dates.js.coffee | 2 +- app/mailers/spree/user_mailer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/darkswarm/filters/dates.js.coffee b/app/assets/javascripts/darkswarm/filters/dates.js.coffee index 8793ddefd8..cef73413a7 100644 --- a/app/assets/javascripts/darkswarm/filters/dates.js.coffee +++ b/app/assets/javascripts/darkswarm/filters/dates.js.coffee @@ -12,4 +12,4 @@ Darkswarm.filter "sensible_timeframe", (date_in_wordsFilter)-> if moment().add(2, 'days') < moment(date, dateFormat) t 'orders_open' else - t('closing') + date_in_wordsFilter(date) + t('closing') + ' ' + date_in_wordsFilter(date) diff --git a/app/mailers/spree/user_mailer.rb b/app/mailers/spree/user_mailer.rb index 68d37c4b99..ba25809b5d 100644 --- a/app/mailers/spree/user_mailer.rb +++ b/app/mailers/spree/user_mailer.rb @@ -20,7 +20,7 @@ module Spree @user = user I18n.with_locale valid_locale(@user) do mail(to: user.email, from: from_address, - subject: t(:welcome_to) + Spree::Config[:site_name]) + subject: t(:welcome_to) + ' ' + Spree::Config[:site_name]) end end From fcaa9d1b37d8a7f5bdb2af6422d7a4a93dcdc8c5 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 3 Jul 2020 10:32:09 +0100 Subject: [PATCH 2/2] Remove extra space from base translations in closing and welcome to --- config/locales/en.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 4b62644980..3726167337 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -207,8 +207,8 @@ en: explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this. home: "OFN" - title: Open Food Network - welcome_to: 'Welcome to ' + title: "Open Food Network" + welcome_to: "Welcome to" site_meta_description: "We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can…" search_by_name: Search by name or suburb... producers: 'Australian Producers' @@ -1839,8 +1839,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using password: Password remember_me: Remember Me are_you_sure: "Are you sure?" - orders_open: Orders open - closing: "Closing " + orders_open: "Orders open" + closing: "Closing" going_back_to_home_page: "Taking you back to the home page" creating: Creating updating: Updating