From b9fdb41cf2a6ac2a2255e8b0e79227ef3675b770 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 3 Dec 2019 16:17:20 +0100
Subject: [PATCH] disable transifex uploads in debug mode
---
src/i18n.js | 16 +++++++---------
src/page/firstRun/view.js | 32 ++++++++++++++++++--------------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/i18n.js b/src/i18n.js
index ce07f32..90a2f3d 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -36,18 +36,17 @@ function checkMessageAndSave(message, messagesFilePath) {
RNFS.writeFile(messagesFilePath, contents, 'utf8')
.then(() => {
// successful write
-
// send to transifex (should we do this even if the file doesn't get saved?)
- doTransifexUpload(
+ /* doTransifexUpload(
contents,
'lbry-mobile',
() => {
- /* successful */
+ // successful
},
err => {
- /* failed */
+ // failed
}
- );
+ ); */
})
.catch(err => {
if (err) {
@@ -58,7 +57,8 @@ function checkMessageAndSave(message, messagesFilePath) {
}
export function __(message, tokens) {
- let language = window.language;
+ const w = global.window ? global.window : window;
+ let language = w.language;
/* Platform.OS === 'android'
? NativeModules.I18nManager.localeIdentifier
@@ -69,9 +69,7 @@ export function __(message, tokens) {
saveMessage(message);
}
- const translatedMessage = window.i18n_messages[language]
- ? window.i18n_messages[language][message] || message
- : message;
+ const translatedMessage = w.i18n_messages[language] ? w.i18n_messages[language][message] || message : message;
if (!tokens) {
return translatedMessage;
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index b875934..ba73b42 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -51,21 +51,25 @@ class FirstRunScreen extends React.PureComponent {
componentDidUpdate() {
const { language } = this.props;
- if (language && !this.state.languageLoaded) {
+ if (!this.state.languageLoaded) {
this.setState({ languageLoaded: true }, () => {
- // Load the current language setting before doing anything
- const languageFile = RNFS.ExternalDirectoryPath + '/' + language + '.json';
- RNFS.readFile(languageFile, 'utf8')
- .then(fileContents => {
- const json = JSON.parse(fileContents);
- window.language = language;
- window.i18n_messages[language] = json;
- this.checkFirstRun();
- })
- .catch(err => {
- // language file doesn't exist? maintain the default language
- this.checkFirstRun();
- });
+ if (!language) {
+ this.checkFirstRun();
+ } else {
+ // Load the current language setting before doing anything
+ const languageFile = RNFS.ExternalDirectoryPath + '/' + language + '.json';
+ RNFS.readFile(languageFile, 'utf8')
+ .then(fileContents => {
+ const json = JSON.parse(fileContents);
+ window.language = language;
+ window.i18n_messages[language] = json;
+ this.checkFirstRun();
+ })
+ .catch(err => {
+ // language file doesn't exist? maintain the default language
+ this.checkFirstRun();
+ });
+ }
});
}
}