From 2b2132742d0dbaf8bf205383302b9ca72c9b063e Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Wed, 8 May 2019 10:45:39 -0400 Subject: [PATCH 1/3] revised conference page to postpone kenya, change sur title, eu desc --- src/views/conference/2019/index/index.jsx | 118 ++++----------------- src/views/conference/2019/index/index.scss | 7 ++ src/views/conference/2019/index/l10n.json | 3 +- 3 files changed, 27 insertions(+), 101 deletions(-) diff --git a/src/views/conference/2019/index/index.jsx b/src/views/conference/2019/index/index.jsx index 999c5a02e..753977585 100644 --- a/src/views/conference/2019/index/index.jsx +++ b/src/views/conference/2019/index/index.jsx @@ -53,7 +53,7 @@ const ConferenceSplash = () => ( src="/svgs/conference/flags/cl.svg" />
-

Conferencia Scratch al Sur

+

Scratch al Sur Conferencia Chile 2019

@@ -141,104 +141,7 @@ const ConferenceSplash = () => ( -

- - Kenya Flag -
-

-

-
- -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Calendar Icon - - - {' - '} - -
- Map Icon - {'Nairobi, Kenya'}
- Audience Icon -
- Language Icon -
- Language Icon - {'#Scratch2019AFR'}
- - - -
-
+
EU Flag (
+
+ + Kenya Flag +
+

+
+ +

+ +

+
Date: Fri, 10 May 2019 08:01:59 -0400 Subject: [PATCH 2/3] Fix translations script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don’t overwrite the english defaults from the local `l10n.json` source files with ‘en’ downloaded from transifex. --- bin/build-locales | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/build-locales b/bin/build-locales index 0c2c20d4d..6ff1553c7 100755 --- a/bin/build-locales +++ b/bin/build-locales @@ -106,7 +106,9 @@ for ( var l in languages ) { l + '.json' ); fs.accessSync(langTranslations); - generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); + if (l !== 'en') { + generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); + } } catch (err) { // just use english generalLocales[l] = generalLocales['en']; @@ -228,8 +230,11 @@ async.forEachLimit(views, 5, function (view, cb) { } } try { - viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); - defaults(viewLocales[isoCode], viewLocales['en']); + // don't overwrite english view strings + if (isoCode !== 'en') { + viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); + defaults(viewLocales[isoCode], viewLocales['en']); + } } catch (e) { return cb(e); } From 69bc0348e7cae3d204e3dde6e46687c43c0aa0da Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 13 May 2019 11:55:21 -0400 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"Fix=20translations=20script?= =?UTF-8?q?=E2=80=9D;=20moved=20to=20separate=20PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3a651fa9fd1778fb80ce8f1d6b4a712bc3801610. --- bin/build-locales | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bin/build-locales b/bin/build-locales index 6ff1553c7..0c2c20d4d 100755 --- a/bin/build-locales +++ b/bin/build-locales @@ -106,9 +106,7 @@ for ( var l in languages ) { l + '.json' ); fs.accessSync(langTranslations); - if (l !== 'en') { - generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); - } + generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); } catch (err) { // just use english generalLocales[l] = generalLocales['en']; @@ -230,11 +228,8 @@ async.forEachLimit(views, 5, function (view, cb) { } } try { - // don't overwrite english view strings - if (isoCode !== 'en') { - viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); - defaults(viewLocales[isoCode], viewLocales['en']); - } + viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); + defaults(viewLocales[isoCode], viewLocales['en']); } catch (e) { return cb(e); }