From df8a2545f8d3bbdd262d03f9c621a0ba30ffcaf4 Mon Sep 17 00:00:00 2001 From: Branden Visser Date: Mon, 31 Aug 2015 10:40:48 -0700 Subject: [PATCH] (MySearch) Add trailing whitespace back; don't trim whitespace for properties files --- .editorconfig | 3 +++ shared/oae/bundles/ui/fr_FR.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 5a6b6612561..beba309f889 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,6 @@ charset = utf-8 trim_trailing_whitespace = true indent_style = space indent_size = 4 + +[*.properties] +trim_trailing_whitespace = false diff --git a/shared/oae/bundles/ui/fr_FR.properties b/shared/oae/bundles/ui/fr_FR.properties index 1cfca4bc4ac..4a3242070ef 100644 --- a/shared/oae/bundles/ui/fr_FR.properties +++ b/shared/oae/bundles/ui/fr_FR.properties @@ -357,7 +357,7 @@ JQUERY_TIMEAGO_MINUTES=%d minutes JQUERY_TIMEAGO_MONTH=environ un mois JQUERY_TIMEAGO_MONTHS=%d mois JQUERY_TIMEAGO_SECONDS=moins d'une minute -JQUERY_TIMEAGO_SUFFIXAGO=\ +JQUERY_TIMEAGO_SUFFIXAGO=\ JQUERY_TIMEAGO_SUFFIXFROMNOW=\u00e0 partir de maintenant JQUERY_TIMEAGO_YEAR=environ une ann\u00e9e JQUERY_TIMEAGO_YEARS=%d ann\u00e9es