From fb473ce8c196b91d680047c5eea5e0352ee67f02 Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 7 Mar 2019 22:29:19 +0300 Subject: [PATCH 01/93] created default footer strucure --- src/config/locales/en-US.json | 1 + src/realm/realm.js | 18 +++++++-- src/redux/actions/applicationActions.js | 8 +++- src/redux/constants/constants.js | 1 + src/redux/reducers/applicationReducer.js | 8 +++- .../container/applicationContainer.js | 2 + .../editor/container/editorContainer.js | 5 ++- .../settings/container/settingsContainer.js | 36 +++++++++++------- src/screens/settings/screen/settingsScreen.js | 38 ++++++++++++------- 9 files changed, 83 insertions(+), 34 deletions(-) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 6656bf34f..4ff2ebc33 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -65,6 +65,7 @@ "pincode": "PIN code", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", diff --git a/src/realm/realm.js b/src/realm/realm.js index 93a67d04d..5313b38df 100644 --- a/src/realm/realm.js +++ b/src/realm/realm.js @@ -45,13 +45,14 @@ const draftSchema = { const settingsSchema = { name: SETTINGS_SCHEMA, properties: { - language: { type: 'string', default: null }, - isDarkTheme: { type: 'bool', default: false }, currency: { type: 'string', default: null }, + isDarkTheme: { type: 'bool', default: false }, + isDefaultFooter: { type: 'bool', default: true }, + language: { type: 'string', default: null }, notification: { type: 'bool', default: true }, + nsfw: { type: 'string', default: null }, server: { type: 'string', default: null }, upvotePercent: { type: 'string', default: null }, - nsfw: { type: 'string', default: null }, }, }; @@ -344,6 +345,17 @@ export const setTheme = isDarkTheme => new Promise((resolve, reject) => { } }); +export const setDefaultFooter = isDefaultFooter => new Promise((resolve, reject) => { + try { + realm.write(() => { + settings[0].isDefaultFooter = isDefaultFooter; + resolve(true); + }); + } catch (error) { + reject(error); + } +}); + export const setUpvotePercent = percent => new Promise((resolve, reject) => { try { realm.write(() => { diff --git a/src/redux/actions/applicationActions.js b/src/redux/actions/applicationActions.js index b539dce52..a70389e87 100644 --- a/src/redux/actions/applicationActions.js +++ b/src/redux/actions/applicationActions.js @@ -5,6 +5,7 @@ import { CLOSE_PIN_CODE_MODAL, IS_CONNECTED, IS_DARK_THEME, + IS_DEFAULT_FOOTER, IS_LOGIN_DONE, IS_NOTIFICATION_OPEN, LOGIN, @@ -14,8 +15,8 @@ import { SET_API, SET_CURRENCY, SET_LANGUAGE, - SET_UPVOTE_PERCENT, SET_NSFW, + SET_UPVOTE_PERCENT, } from '../constants/constants'; export const login = payload => ({ @@ -83,6 +84,11 @@ export const setNsfw = payload => ({ type: SET_NSFW, }); +export const isDefaultFooter = payload => ({ + payload, + type: IS_DEFAULT_FOOTER, +}); + /** * MW */ diff --git a/src/redux/constants/constants.js b/src/redux/constants/constants.js index 17015c5ba..5d196d439 100644 --- a/src/redux/constants/constants.js +++ b/src/redux/constants/constants.js @@ -11,6 +11,7 @@ export const IS_DARK_THEME = 'IS_DARK_THEME'; export const IS_LOGGED_IN = 'IS_LOGGED_IN'; export const IS_LOGIN_DONE = 'IS_LOGIN_DONE'; export const IS_NOTIFICATION_OPEN = 'IS_NOTIFICATION_OPEN'; +export const IS_DEFAULT_FOOTER = 'IS_DEFAULT_FOOTER'; export const LOGIN = 'LOGIN'; export const LOGOUT = 'LOGOUT'; export const LOGOUT_DONE = 'LOGOUT_DONE'; diff --git a/src/redux/reducers/applicationReducer.js b/src/redux/reducers/applicationReducer.js index bb60404cd..f20cd0c30 100644 --- a/src/redux/reducers/applicationReducer.js +++ b/src/redux/reducers/applicationReducer.js @@ -3,6 +3,7 @@ import { CLOSE_PIN_CODE_MODAL, IS_CONNECTED, IS_DARK_THEME, + IS_DEFAULT_FOOTER, IS_LOGIN_DONE, IS_NOTIFICATION_OPEN, LOGIN, @@ -12,8 +13,8 @@ import { SET_API, SET_CURRENCY, SET_LANGUAGE, - SET_UPVOTE_PERCENT, SET_NSFW, + SET_UPVOTE_PERCENT, } from '../constants/constants'; const initialState = { @@ -26,6 +27,7 @@ const initialState = { isActive: false, isConnected: true, // internet connectivity isDarkTheme: false, + isDefaultFooter: true, isLoggedIn: false, // Has any logged in user. isLoginDone: false, isLogingOut: false, @@ -107,6 +109,10 @@ export default function (state = initialState, action) { return Object.assign({}, state, { nsfw: action.payload, }); + case IS_DEFAULT_FOOTER: + return Object.assign({}, state, { + isDefaultFooter: action.payload, + }); default: return state; } diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 665536a6e..ccdb6159f 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -39,6 +39,7 @@ import { setAuthStatus, removeSCAccount, setExistUser, + setDefaultFooter, } from '../../../realm/realm'; import { getUser } from '../../../providers/steem/dsteem'; import { setPushToken } from '../../../providers/esteem/esteem'; @@ -247,6 +248,7 @@ class ApplicationContainer extends Component { if (response.language !== '') dispatch(setLanguage(response.language)); if (response.server !== '') dispatch(setApi(response.server)); if (response.upvotePercent !== '') dispatch(setUpvotePercent(Number(response.upvotePercent))); + if (response.isDefaultFooter !== '') dispatch(setDefaultFooter(response.isDefaultFooter)); if (response.notification !== '') { dispatch(isNotificationOpen(response.notification)); Push.setEnabled(response.notification); diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js index d31fd9de8..59f18f08b 100644 --- a/src/screens/editor/container/editorContainer.js +++ b/src/screens/editor/container/editorContainer.js @@ -293,7 +293,7 @@ class EditorContainer extends Component { _submitPost = async (fields) => { const { - navigation, currentAccount, pinCode, intl, + navigation, currentAccount, pinCode, intl, isDefaultFooter, } = this.props; if (currentAccount) { @@ -533,9 +533,10 @@ class EditorContainer extends Component { } const mapStateToProps = state => ({ + currentAccount: state.account.currentAccount, + isDefaultFooter: state.account.isDefaultFooter, isLoggedIn: state.application.isLoggedIn, pinCode: state.account.pin, - currentAccount: state.account.currentAccount, }); export default connect(mapStateToProps)(injectIntl(EditorContainer)); diff --git a/src/screens/settings/container/settingsContainer.js b/src/screens/settings/container/settingsContainer.js index 4996886a5..bcc6beff4 100644 --- a/src/screens/settings/container/settingsContainer.js +++ b/src/screens/settings/container/settingsContainer.js @@ -7,23 +7,25 @@ import { Client } from 'dsteem'; // Realm import { - setTheme, - setLanguage as setLanguage2DB, - setCurrency as setCurrency2DB, - setServer, - setNotificationIsOpen, getExistUser, + setCurrency as setCurrency2DB, + setDefaultFooter, + setLanguage as setLanguage2DB, + setNotificationIsOpen, setNsfw as setNsfw2DB, + setServer, + setTheme, } from '../../../realm/realm'; // Services and Actions import { - setLanguage, - isNotificationOpen, - setCurrency, - setApi, isDarkTheme, + isDefaultFooter, + isNotificationOpen, openPinCodeModal, + setApi, + setCurrency, + setLanguage, setNsfw, } from '../../../redux/actions/applicationActions'; import { toastNotification } from '../../../redux/actions/uiAction'; @@ -150,6 +152,11 @@ class SettingsContainer extends Component { dispatch(isDarkTheme(action)); setTheme(action); break; + + case 'default_footer': + dispatch(isDefaultFooter(action)); + // setDefaultFooter(action); + break; default: break; } @@ -231,14 +238,15 @@ class SettingsContainer extends Component { } const mapStateToProps = state => ({ - selectedLanguage: state.application.language, + isDarkTheme: state.application.isDarkTheme, + isDefaultFooter: state.application.isDefaultFooter, + isLoggedIn: state.application.isLoggedIn, + isNotificationSettingsOpen: state.application.isNotificationOpen, + nsfw: state.application.nsfw, selectedApi: state.application.api, selectedCurrency: state.application.currency, - isDarkTheme: state.application.isDarkTheme, - isNotificationSettingsOpen: state.application.isNotificationOpen, - isLoggedIn: state.application.isLoggedIn, + selectedLanguage: state.application.language, username: state.account.currentAccount && state.account.currentAccount.name, - nsfw: state.application.nsfw, }); export default connect(mapStateToProps)(SettingsContainer); diff --git a/src/screens/settings/screen/settingsScreen.js b/src/screens/settings/screen/settingsScreen.js index 4bda6243b..f9aa1f6d4 100644 --- a/src/screens/settings/screen/settingsScreen.js +++ b/src/screens/settings/screen/settingsScreen.js @@ -1,4 +1,4 @@ -import React, { PureComponent } from 'react'; +import React, { PureComponent, Fragment } from 'react'; import { ScrollView, View } from 'react-native'; import { injectIntl } from 'react-intl'; @@ -36,13 +36,14 @@ class SettingsScreen extends PureComponent { handleOnChange, intl, isDarkTheme, + isDefaultFooter, isLoggedIn, isNotificationSettingsOpen, + nsfw, selectedApi, selectedCurrency, selectedLanguage, serverList, - nsfw, } = this.props; return ( @@ -116,17 +117,28 @@ class SettingsScreen extends PureComponent { handleOnChange={handleOnChange} /> {!!isLoggedIn && ( - + + + + )} From e31adac1603d87b96727021f126f61c72e0953fd Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 14 Mar 2019 20:43:49 +0300 Subject: [PATCH 02/93] weird changes --- .../Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig | 1 + .../Pods-esteem/Pods-esteem.release.xcconfig | 1 + .../Pods-esteemTests/Pods-esteemTests.debug.xcconfig | 1 + .../Pods-esteemTests/Pods-esteemTests.release.xcconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig index 0695013b2..d39c7d90b 100644 --- a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig @@ -9,3 +9,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig index 0695013b2..d39c7d90b 100644 --- a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig @@ -9,3 +9,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig index 1a1659871..e629a3239 100644 --- a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig @@ -8,3 +8,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig index 1a1659871..e629a3239 100644 --- a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig @@ -8,3 +8,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage From 0cfeda776c0bdc79659c66f850583269dd27be61 Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 14 Mar 2019 21:57:33 +0300 Subject: [PATCH 03/93] fixed edit bug --- src/utils/postParser.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utils/postParser.js b/src/utils/postParser.js index c621bc034..14aede2cc 100644 --- a/src/utils/postParser.js +++ b/src/utils/postParser.js @@ -3,14 +3,18 @@ import { markDown2Html } from './markdownToHtml'; import { getPostSummary } from './formatter'; import { getReputation } from './reputation'; -export const parsePosts = (posts, currentUserName, isSummary) => (!posts ? null : posts.map(post => parsePost(post, currentUserName, isSummary))); +export const parsePosts = (posts, currentUserName) => (!posts ? null : posts.map(post => parsePost(post, currentUserName))); -export const parsePost = (post, currentUserName, isSummary = false) => { +export const parsePost = (post, currentUserName) => { if (!post) { return null; } const _post = post; + if (currentUserName === _post.author) { + _post.markdownBody = post.body; + } + _post.json_metadata = JSON.parse(post.json_metadata); _post.image = postImage(post.json_metadata, post.body); _post.vote_count = post.active_votes.length; @@ -28,10 +32,6 @@ export const parsePost = (post, currentUserName, isSummary = false) => { _post.is_voted = false; } - if (currentUserName === _post.author) { - _post.markdownBody = post.body; - } - const totalPayout = parseFloat(_post.pending_payout_value) + parseFloat(_post.total_payout_value) + parseFloat(_post.curator_payout_value); From be9038dcd7b29351d2a4a283b6bd635acf47460f Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 14 Mar 2019 22:08:05 +0300 Subject: [PATCH 04/93] updated a bit --- src/utils/postParser.js | 57 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/utils/postParser.js b/src/utils/postParser.js index 14aede2cc..426fd9877 100644 --- a/src/utils/postParser.js +++ b/src/utils/postParser.js @@ -9,52 +9,51 @@ export const parsePost = (post, currentUserName) => { if (!post) { return null; } - const _post = post; - if (currentUserName === _post.author) { - _post.markdownBody = post.body; + if (currentUserName === post.author) { + post.markdownBody = post.body; } - _post.json_metadata = JSON.parse(post.json_metadata); - _post.image = postImage(post.json_metadata, post.body); - _post.vote_count = post.active_votes.length; - _post.author_reputation = getReputation(post.author_reputation); - _post.avatar = `https://steemitimages.com/u/${post.author}/avatar/small`; - _post.active_votes.sort((a, b) => b.rshares - a.rshares); + post.json_metadata = JSON.parse(post.json_metadata); + post.image = postImage(post.json_metadata, post.body); + post.vote_count = post.active_votes.length; + post.author_reputation = getReputation(post.author_reputation); + post.avatar = `https://steemitimages.com/u/${post.author}/avatar/small`; + post.active_votes.sort((a, b) => b.rshares - a.rshares); - _post.body = markDown2Html(post.body); - _post.summary = getPostSummary(post.body, 150); - _post.is_declined_payout = Number(parseFloat(post.max_accepted_payout)) === 0; + post.body = markDown2Html(post.body); + post.summary = getPostSummary(post.body, 150); + post.is_declined_payout = Number(parseFloat(post.max_accepted_payout)) === 0; if (currentUserName) { - _post.is_voted = isVoted(_post.active_votes, currentUserName); + post.is_voted = isVoted(post.active_votes, currentUserName); } else { - _post.is_voted = false; + post.is_voted = false; } - const totalPayout = parseFloat(_post.pending_payout_value) - + parseFloat(_post.total_payout_value) - + parseFloat(_post.curator_payout_value); + const totalPayout = parseFloat(post.pending_payout_value) + + parseFloat(post.total_payout_value) + + parseFloat(post.curator_payout_value); - _post.total_payout = totalPayout.toFixed(3); + post.total_payout = totalPayout.toFixed(3); - const voteRshares = _post.active_votes.reduce((a, b) => a + parseFloat(b.rshares), 0); + const voteRshares = post.active_votes.reduce((a, b) => a + parseFloat(b.rshares), 0); const ratio = totalPayout / voteRshares; - if (_post.active_votes && _post.active_votes.length > 0) { - for (const i in _post.active_votes) { - _post.vote_perecent = post.active_votes[i].voter === currentUserName ? post.active_votes[i].percent : null; - _post.active_votes[i].value = (post.active_votes[i].rshares * ratio).toFixed(3); - _post.active_votes[i].reputation = getReputation(post.active_votes[i].reputation); - _post.active_votes[i].percent = post.active_votes[i].percent / 100; - _post.active_votes[i].is_down_vote = Math.sign(post.active_votes[i].percent) < 0; - _post.active_votes[i].avatar = `https://steemitimages.com/u/${ - _post.active_votes[i].voter + if (post.active_votes && post.active_votes.length > 0) { + for (const i in post.active_votes) { + post.vote_perecent = post.active_votes[i].voter === currentUserName ? post.active_votes[i].percent : null; + post.active_votes[i].value = (post.active_votes[i].rshares * ratio).toFixed(3); + post.active_votes[i].reputation = getReputation(post.active_votes[i].reputation); + post.active_votes[i].percent = post.active_votes[i].percent / 100; + post.active_votes[i].is_down_vote = Math.sign(post.active_votes[i].percent) < 0; + post.active_votes[i].avatar = `https://steemitimages.com/u/${ + post.active_votes[i].voter }/avatar/small`; } } - return _post; + return post; }; const isVoted = (activeVotes, currentUserName) => activeVotes.some(v => v.voter === currentUserName && v.percent > 0); From 71ce21b5f55efcc033fb895b27f00ddac17de5e1 Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 14 Mar 2019 22:36:00 +0300 Subject: [PATCH 05/93] fixed 604 --- src/components/editorElements/tagArea/view/tagAreaView.js | 1 - src/components/editorElements/titleArea/view/titleAreaView.js | 4 ++-- src/components/markdownEditor/view/markdownEditorView.js | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/editorElements/tagArea/view/tagAreaView.js b/src/components/editorElements/tagArea/view/tagAreaView.js index 2ece409f3..7c9a1d3ba 100644 --- a/src/components/editorElements/tagArea/view/tagAreaView.js +++ b/src/components/editorElements/tagArea/view/tagAreaView.js @@ -124,7 +124,6 @@ export default class TagAreaView extends Component { } autoCapitalize="none" onFocus={() => this.setState({ activeChip: i })} - {...this.props} /> ), )} diff --git a/src/components/editorElements/titleArea/view/titleAreaView.js b/src/components/editorElements/titleArea/view/titleAreaView.js index a17a08ddf..f1f3ddb45 100644 --- a/src/components/editorElements/titleArea/view/titleAreaView.js +++ b/src/components/editorElements/titleArea/view/titleAreaView.js @@ -44,12 +44,12 @@ export default class TitleAreaView extends Component { render() { const { intl, isPreviewActive, autoFocus } = this.props; - const { text } = this.state; + const { text, height } = this.state; return ( ) : ( this._renderPreview() From bd4b3dc3972979aebdffe2f76fa8abba50f95544 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:27 +0200 Subject: [PATCH 06/93] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index 6ebf72013..9d515b490 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 95fb0a11fd370379eed71846deccf3b4c8ca7fe5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:29 +0200 Subject: [PATCH 07/93] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index 4305fe075..7c43f908a 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Resetiraj", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From ae413a99d047af7cd530b4de3253a44995189b1b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:30 +0200 Subject: [PATCH 08/93] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 56aa1b0ea3570f1571641c63d256c36a0ba8ee0c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:31 +0200 Subject: [PATCH 09/93] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 08cf4da51b23893d29748d7c65fd114d3ecfd0d2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:33 +0200 Subject: [PATCH 10/93] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 49cebcceb74348a3f283ce9d9190616c07e0da1b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:34 +0200 Subject: [PATCH 11/93] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index a792575ed..8ceb7e5ff 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -66,6 +66,7 @@ "pincode": "PIN 碼", "reset": "重置", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From e100e7641bd0bb1e0c5375e189f4642f28132caf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:36 +0200 Subject: [PATCH 12/93] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 0d1a3671dad31098dd0267326d11aded2df9dae8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:37 +0200 Subject: [PATCH 13/93] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 32049190fbac3e0fbaa37846750ee8c18cda644a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:38 +0200 Subject: [PATCH 14/93] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From eee6c88b23cd09de26b3d3500e78cddc0412a888 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:40 +0200 Subject: [PATCH 15/93] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index 1a957ca4a..434ec5014 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "重置", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From a11fcfeb2107d3f0c01f1f3146337269e10dc80f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:41 +0200 Subject: [PATCH 16/93] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 027646442..8e2fd68e5 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -66,6 +66,7 @@ "pincode": "PIN code", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 8f3fe19cc09348feb0e59b85b1e6b78e4af83e57 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:42 +0200 Subject: [PATCH 17/93] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 9522cd6bc..80d8734b2 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -66,6 +66,7 @@ "pincode": "رمز PIN", "reset": "إعادة", "nsfw_content": "محتوى NSFW", + "default_footer": "Default Footer", "nsfw": { "always_show": "عرض دوماً", "always_hide": "إخفاء دوماً", From 6b59af2fb10d2e0f59800bd0942de18dab67e107 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:44 +0200 Subject: [PATCH 18/93] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 027646442..8e2fd68e5 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -66,6 +66,7 @@ "pincode": "PIN code", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 7ec954bb3b2073a16c2788d7b36c4feb7e541f64 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:45 +0200 Subject: [PATCH 19/93] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 61e9868f60ec77e38b5f0f8c07ac960cc6657f1b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:47 +0200 Subject: [PATCH 20/93] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 9a3552cf8..a26e1d8f7 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Resetare", "nsfw_content": "Conținut NSFW", + "default_footer": "Default Footer", "nsfw": { "always_show": "Afisează întotdeauna", "always_hide": "Ascunde întotdeauna", From 8cfee7d0cbaa5c54114f3175aa310651c3d285ad Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:48 +0200 Subject: [PATCH 21/93] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 7da7cef24..c85b12b04 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -66,6 +66,7 @@ "pincode": "Пинкод", "reset": "Сбросить", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 20641833f9931586ab45c9e359692565209301a3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:49 +0200 Subject: [PATCH 22/93] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From cc0651cc614f8af08cb380104e12b8d5556e03c2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:51 +0200 Subject: [PATCH 23/93] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 5b06a1d2a82ae39515d28aa76bb745ed5419f293 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:52 +0200 Subject: [PATCH 24/93] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 3efbb933c..24a791c6a 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -66,6 +66,7 @@ "pincode": "PIN kód", "reset": "Visszaállítás", "nsfw_content": "NSFW tartalom", + "default_footer": "Default Footer", "nsfw": { "always_show": "Mindig látszik", "always_hide": "Mindig rejtve", From ee70cb39ca459d21b58e4dd2a62f9cc3f5461e9d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:53 +0200 Subject: [PATCH 25/93] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From bdb76ebfa103e5f976952ad0c41f5b3e0bbc0b72 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:55 +0200 Subject: [PATCH 26/93] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 3d7cb5ca7c0f2e05c8728aa94b88d4474f404aa4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:56 +0200 Subject: [PATCH 27/93] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index f9c6e9be2..2a8b83fc9 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -66,6 +66,7 @@ "pincode": "PIN code", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 28a8aab03b33503f85a7fb3f09a4296fefdf9034 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:57 +0200 Subject: [PATCH 28/93] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 907c46f377547832c5f80a937f81b772e6b73f46 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:35:59 +0200 Subject: [PATCH 29/93] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 20bc1fdde56e02e687bff97953c620fd1884fa5c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:00 +0200 Subject: [PATCH 30/93] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 6980cbffe5f3c2c01969d200106c2e90face3c28 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:02 +0200 Subject: [PATCH 31/93] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index c256282db..59ca32b98 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Atstatyti", "nsfw_content": "NSFW Turinys", + "default_footer": "Default Footer", "nsfw": { "always_show": "Visada rodyti", "always_hide": "Visada paslėpti", From 72ca80862df6ae83f4038d7ebb738af2dfba1ae7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:04 +0200 Subject: [PATCH 32/93] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index e338d705d..98cd14acb 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Resetuj", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From dee04c3abc5ee67b0ca807fdfcbb73d51a7a3a08 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:05 +0200 Subject: [PATCH 33/93] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 7e3cf5fd1339a0baf7cddb724b04a7236071791c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:06 +0200 Subject: [PATCH 34/93] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 1fdb8b55e2dc320803e2f316571beebbdb3d5e05 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:08 +0200 Subject: [PATCH 35/93] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 5eecfb2a6791f03ec666ef04d67aa5673a45cbc2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:09 +0200 Subject: [PATCH 36/93] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 0ce4931f53256762cb51cb348dbfbd890bfdf685 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:11 +0200 Subject: [PATCH 37/93] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 52a84b37498e2803e4f8db7e9f16b3a42b4e6368 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:12 +0200 Subject: [PATCH 38/93] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 6128498ee..a36caa8cb 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From e7500472f39cb1708a3a4924acb3b59e867edf05 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:13 +0200 Subject: [PATCH 39/93] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 5b8e6202ca11da6d863b01050170513a64616da7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:15 +0200 Subject: [PATCH 40/93] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 0afd5686e5799b9e1e94b6b38629d587399a2dca Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:16 +0200 Subject: [PATCH 41/93] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From f72e37b4882cb783c6d911f9f3f4b51c7b347eba Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:18 +0200 Subject: [PATCH 42/93] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 024d04b303e94ad50be725efeca7fedf257b2370 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:19 +0200 Subject: [PATCH 43/93] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index 936d0a605..7285811df 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -66,6 +66,7 @@ "pincode": "PIN code", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From d3237861c3fb649ef0fff61f54c81ccaf4fbf7fd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:21 +0200 Subject: [PATCH 44/93] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index 936d0a605..7285811df 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -66,6 +66,7 @@ "pincode": "PIN code", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 24760307d70e25c4d36811e03dff428bcf983706 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:22 +0200 Subject: [PATCH 45/93] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 90a0475e3f240ea6fa2d0265e23fa5750dd36e30 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:23 +0200 Subject: [PATCH 46/93] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index edf10e6de..4678a029c 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Tun bere", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 87b23f48656ecfe872edf680509840092d6fae6c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:25 +0200 Subject: [PATCH 47/93] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From a5ed046f71bcb688bd814338c285753d0fb0aff6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:26 +0200 Subject: [PATCH 48/93] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 1762942d38ffbaa9e00b7b28e7b11af3d7dfddb1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:28 +0200 Subject: [PATCH 49/93] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 54f439d1cc782b025af4392a2acb93c4021933a5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:29 +0200 Subject: [PATCH 50/93] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index dccf6c6d0..b0984594d 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -66,6 +66,7 @@ "pincode": "PIN-koodi", "reset": "Nollaa", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From e79383b15b989a2209d07939297dbed6a7c1fedd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:30 +0200 Subject: [PATCH 51/93] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index e569d303e..f4d452e41 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Tetapkan semula", "nsfw_content": "Kandungan NSFW", + "default_footer": "Default Footer", "nsfw": { "always_show": "Benarkan", "always_hide": "Tutup", From 6edeb64ad40f356d69cfc5e72379f88c3770fa09 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:32 +0200 Subject: [PATCH 52/93] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index d60f2f199..469341a87 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -66,6 +66,7 @@ "pincode": "Mã PIN", "reset": "Thiết lập lại", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From aa3b9ebbb74afe0aee0b2e9c5f5a53dd7e02e9c5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:33 +0200 Subject: [PATCH 53/93] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index d891fb026..630548b5c 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -66,6 +66,7 @@ "pincode": "Kode PIN", "reset": "Setel Ulang", "nsfw_content": "Konten NSFW", + "default_footer": "Default Footer", "nsfw": { "always_show": "Selalu Tampilkan", "always_hide": "Selalu menyembunyikan", From 45fadd0e7f3f27784fe431091c6286d8ce4494d2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:34 +0200 Subject: [PATCH 54/93] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index ba9c4b546..eb8362049 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -66,6 +66,7 @@ "pincode": "Pinkod", "reset": "Sifirla", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 712b7f1c416f38dfe4fa5eb7234c0018a1f6208e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:36 +0200 Subject: [PATCH 55/93] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 91591e727..2142797bc 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -66,6 +66,7 @@ "pincode": "Código PIN", "reset": "Reiniciar", "nsfw_content": "Conteúdo NSFW", + "default_footer": "Default Footer", "nsfw": { "always_show": "Mostrar sempre", "always_hide": "Ocultar sempre", From a36d9b22f75609fa9403e9b583b195d51ac7291f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:37 +0200 Subject: [PATCH 56/93] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index fda6e9bca..abf5a94f7 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "راه اندازی مجدد", "nsfw_content": "محتوای نامناسب برای کودکان", + "default_footer": "Default Footer", "nsfw": { "always_show": "همیشه نمایش بده", "always_hide": "همیشه پنهان باشد", From 753f1bd63fdc39e6b87caa7f66d2e5d08de00cc9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:39 +0200 Subject: [PATCH 57/93] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 1a9d7a37e80661a2b65b9af0da72dad71f51f79c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:40 +0200 Subject: [PATCH 58/93] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 37448679f0f5990616a1d6445090299594ef02f1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:41 +0200 Subject: [PATCH 59/93] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 354bad454..3c4a54d4a 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From d86b6391b5b4aaa5b66a7fc738f17a83cf82b095 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:43 +0200 Subject: [PATCH 60/93] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 2f07b912357b0dcc662d8754d8658c582907dac0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:44 +0200 Subject: [PATCH 61/93] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 4357fecb11086468246fb76e01d822326a3f03ca Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:45 +0200 Subject: [PATCH 62/93] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index fbd3ce151..e692881e4 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 96b8198774ac7cd7fd0dd804a10e66dee8eb1bd7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:47 +0200 Subject: [PATCH 63/93] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index 761ad3454..b59e8fe91 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Réinitialiser", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 08a5dc035b02761d394cced3c723bf2c32ad1493 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:48 +0200 Subject: [PATCH 64/93] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index 95fb4762b..9a06aa3f5 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -66,6 +66,7 @@ "pincode": "PIN 코드", "reset": "초기화", "nsfw_content": "NSFW 콘텐츠", + "default_footer": "Default Footer", "nsfw": { "always_show": "항상 보여주기", "always_hide": "항상 숨기기", From 79da7d838c27a3628e81876c4e3b3ed42220491d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:49 +0200 Subject: [PATCH 65/93] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 022a3d62aeda142b9c4587901349e3e8f89572fa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:51 +0200 Subject: [PATCH 66/93] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 437c4ce7db31bdc87fa13be5c35200ef7f652dba Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:52 +0200 Subject: [PATCH 67/93] New translations en-US.json (German) --- src/config/locales/de-DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 1caddf93c..22b701efa 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Zurücksetzen", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From b2d2e30badef93043c5be004ea4bf6ba82afc150 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:54 +0200 Subject: [PATCH 68/93] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From ceeb6c3988ef1712bff25292054c83da086030cf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:55 +0200 Subject: [PATCH 69/93] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 16c97284e15ab110068449c1c346a33eeb74b112 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:56 +0200 Subject: [PATCH 70/93] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 32caa5d03..0f7cba795 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -66,6 +66,7 @@ "pincode": "קוד PIN", "reset": "אתחל", "nsfw_content": "תוכן NSFW", + "default_footer": "Default Footer", "nsfw": { "always_show": "הצג תמיד", "always_hide": "הסתר תמיד", From c01e13d4fda75383526444f3e58fb832baeb39d6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:58 +0200 Subject: [PATCH 71/93] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index d0863f3c4..e3bc69c13 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "पुनः नियोजन", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 47a70625000760e9985aad84b556c301f7fb5f09 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:36:59 +0200 Subject: [PATCH 72/93] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 73edd2bd6..ee32ddbd8 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reiniciar", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 671d69ea8d6af97481b36aa7df633170e478824d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:37:01 +0200 Subject: [PATCH 73/93] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 5a1e1cd5c643bc234632ff3a16208daf1172e0a5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:37:03 +0200 Subject: [PATCH 74/93] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index 89a6babb1..b548fb501 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Resetta", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 3a2221b4886b73201c7cb546ac61681520af24a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:37:04 +0200 Subject: [PATCH 75/93] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From af10200fe52ece5f105e559edc4fa9cc869ac070 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:37:06 +0200 Subject: [PATCH 76/93] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 9b2ad0a3091579b45eed4bd99245786f409db814 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:37:07 +0200 Subject: [PATCH 77/93] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index dc224d2c2..24269f452 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -66,6 +66,7 @@ "pincode": "Pincode", "reset": "Reset", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From de6e1696c3013ee33a8371492a9209e416abd265 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 16 Mar 2019 23:37:08 +0200 Subject: [PATCH 78/93] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index b53e8691b..7610e0b25 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -66,6 +66,7 @@ "pincode": "Kode PIN", "reset": "Atôe ulang", "nsfw_content": "NSFW Content", + "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", "always_hide": "Always hide", From 066afb4823537868724a7a3113adfcdee706b906 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 00:23:46 +0200 Subject: [PATCH 79/93] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index f4d452e41..f4350aec3 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -66,7 +66,7 @@ "pincode": "Pincode", "reset": "Tetapkan semula", "nsfw_content": "Kandungan NSFW", - "default_footer": "Default Footer", + "default_footer": "Ranka Pendirian", "nsfw": { "always_show": "Benarkan", "always_hide": "Tutup", @@ -214,9 +214,9 @@ "comments": "Komen" }, "comment_filter": { - "trending": "trending", - "reputation": "reputation", - "votes": "votes", - "age": "age" + "trending": "tending", + "reputation": "reputasi", + "votes": "vote", + "age": "usia" } } From 9929e7dac9cfa561fe7a2c85bd5ddae2d6967e83 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 10:33:50 +0200 Subject: [PATCH 80/93] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 24a791c6a..3e0bc6547 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -66,7 +66,7 @@ "pincode": "PIN kód", "reset": "Visszaállítás", "nsfw_content": "NSFW tartalom", - "default_footer": "Default Footer", + "default_footer": "Alapértelmezett lábléc", "nsfw": { "always_show": "Mindig látszik", "always_hide": "Mindig rejtve", From 234ba1339bcc2afaeab97f5d29c1d635b73f4cd2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 15:14:48 +0200 Subject: [PATCH 81/93] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 0f7cba795..4033a159e 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -19,7 +19,7 @@ "unfollow": "הפסיק\\ה לעקוב אחרייך", "ignore": "התעלם\\ה ממך", "reblog": "העלה\\תה את הפוסט שלך לבלוג שלו\\ה", - "transfer": "transfered steem", + "transfer": "סטים מועבר", "comingsoon": "מאפיין לוח התוצאות יוצא להשקה בקרוב!", "notification": "התראות", "leaderboard": "לוח תוצאות", @@ -66,7 +66,7 @@ "pincode": "קוד PIN", "reset": "אתחל", "nsfw_content": "תוכן NSFW", - "default_footer": "Default Footer", + "default_footer": "ברירת מחדל תחתונה", "nsfw": { "always_show": "הצג תמיד", "always_hide": "הסתר תמיד", @@ -146,7 +146,7 @@ "invalid_pincode": "קוד PIN לא תקין, אנא בדוק ונסה שנית.", "remove_alert": "האם בוודאות ברצונך להסיר?", "clear_alert": "האם את\\ה בטוח\\ה שברצונך למחוק?", - "clear_user_alert": "Are you sure you want to clear all user data?", + "clear_user_alert": "האם את\/ה בטוח\/ה שברצונך למחוק את כל נתוני המשתמש?", "clear": "ריק", "cancel": "בטל\\י", "delete": "מחק\\י", From 58b7e6f681f5f2e2cad20fd18d9c723aa61112c5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 20:13:44 +0200 Subject: [PATCH 82/93] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 4033a159e..294309738 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -8,7 +8,7 @@ "transfer_to_vesting": "העבר לVesting", "transfer_from_savings": "העבר מחסכונות", "withdraw_vesting": "המרת כוח הסטים ליתרה נזילה", - "fill_order": "מלא בקשה" + "fill_order": "מלא הזמנה" }, "notification": { "vote": "אוהב\\ת את הפוסט שלך", @@ -18,7 +18,7 @@ "follow": "עקב\\ה אחרייך", "unfollow": "הפסיק\\ה לעקוב אחרייך", "ignore": "התעלם\\ה ממך", - "reblog": "העלה\\תה את הפוסט שלך לבלוג שלו\\ה", + "reblog": "שיתף\/ה את הפוסט שלך", "transfer": "סטים מועבר", "comingsoon": "מאפיין לוח התוצאות יוצא להשקה בקרוב!", "notification": "התראות", @@ -58,7 +58,7 @@ }, "settings": { "settings": "הגדרות", - "currency": "יתרה", + "currency": "יתרת מטבע", "language": "שפה", "server": "שרת", "dark_theme": "ערכת נושא כהה", @@ -139,7 +139,7 @@ "fail": "נכשל!", "success_shared": "הפוסט שלך שותף בהצלחה", "permission_denied": "בקשה נדחתה", - "permission_text": "אנא, שנה את ההרשאות באפליקציית הeSteem, דרך ההגדרות בטלפון.", + "permission_text": "אנא, שנה את ההרשאות לאפליקציית ה eSteem, דרך ההגדרות בטלפון.", "success_rebloged": "שותף!", "already_rebloged": "כבר שיתפת!", "warning": "אזהרה", From d20398a2fd9e38547c126035c2a317b0235de984 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 20:24:22 +0200 Subject: [PATCH 83/93] New translations en-US.json (German) --- src/config/locales/de-DE.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 22b701efa..3f87c1ed2 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -65,12 +65,12 @@ "push_notification": "Push-Benachrichtigung", "pincode": "Pincode", "reset": "Zurücksetzen", - "nsfw_content": "NSFW Content", - "default_footer": "Default Footer", + "nsfw_content": "NSFW Inhalt", + "default_footer": "Standard Fußzeile", "nsfw": { - "always_show": "Always show", - "always_hide": "Always hide", - "always_warn": "Always warn" + "always_show": "Immer anzeigen", + "always_hide": "Immer verstecken", + "always_warn": "Immer warnen" } }, "voters": { @@ -87,7 +87,7 @@ "cancel": "Abbrechen", "login": "LOGIN", "steemconnect_description": "Wenn du dein Passwort nicht verschlüsselt auf deinem Gerät gespeichert halten möchtest, kannst du Steemconnect verwenden.", - "steemconnect_fee_description": "Steemconnect may charge some fees from your reward transactions" + "steemconnect_fee_description": "Steemconnect kann einige Gebühren für Ihre Reward-Transaktionen berechnen" }, "home": { "feed": "Feed", @@ -145,9 +145,9 @@ "warning": "Warnung", "invalid_pincode": "Ungültiger PIN-Code, bitte überprüfen und erneut versuchen.", "remove_alert": "Bist du sicher, dass du es entfernen möchtest?", - "clear_alert": "Are you sure you want to clear?", - "clear_user_alert": "Are you sure you want to clear all user data?", - "clear": "Clear", + "clear_alert": "Sind sie sicher, das sie alles löschen wollen?", + "clear_user_alert": "Wollen sie wirklich alle Benutzerdaten löschen?", + "clear": "Löschen", "cancel": "Abbrechen", "delete": "Entfernen", "copied": "Kopiert!", @@ -175,7 +175,7 @@ "empty_list": "Keine Einträge vorhanden", "deleted": "Lesezeichen entfernt", "search": "In Lesezeichen suchen", - "added": "Added to bookmarks", + "added": "Zu deinen Lesezeichen hinzugefügt", "add": "Neues Lesezeichen" }, "favorites": { @@ -210,13 +210,13 @@ "no_existing_post": "Kein vorhandener Beitrag" }, "search": { - "posts": "Posts", - "comments": "Comments" + "posts": "Beiträge", + "comments": "Kommentare" }, "comment_filter": { - "trending": "trending", - "reputation": "reputation", - "votes": "votes", - "age": "age" + "trending": "im Trend", + "reputation": "ruf", + "votes": "stimmen", + "age": "alter" } } From 67986ba797e151629e13e51cb504025b1c48cc18 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 20:24:24 +0200 Subject: [PATCH 84/93] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 294309738..2c83f2c4a 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -62,7 +62,7 @@ "language": "שפה", "server": "שרת", "dark_theme": "ערכת נושא כהה", - "push_notification": "הודעות דחיפה", + "push_notification": "התראות דחיפה", "pincode": "קוד PIN", "reset": "אתחל", "nsfw_content": "תוכן NSFW", @@ -75,7 +75,7 @@ }, "voters": { "voters_info": "פרטי המצביעים", - "no_user": "לא נמצא שום משתמש\\ת." + "no_user": "לא נמצא משתמש\\ת." }, "login": { "signin": "התחבר\\י", @@ -97,7 +97,7 @@ "profile": "פרופיל", "bookmarks": "סימניות", "favorites": "מועדפים", - "drafts": "טיוטה", + "drafts": "טיוטות", "schedules": "לוחות זמנים", "gallery": "גלריה", "settings": "הגדרות", @@ -138,7 +138,7 @@ "claim_reward_balance_ok": "תגמול יתרה נתקבלה", "fail": "נכשל!", "success_shared": "הפוסט שלך שותף בהצלחה", - "permission_denied": "בקשה נדחתה", + "permission_denied": "הרשאה נדחתה", "permission_text": "אנא, שנה את ההרשאות לאפליקציית ה eSteem, דרך ההגדרות בטלפון.", "success_rebloged": "שותף!", "already_rebloged": "כבר שיתפת!", @@ -157,7 +157,7 @@ "reblog_alert": "האם את\\ה בטוח\/ה רוצה לשתף ?" }, "drafts": { - "title": "טיוטה", + "title": "טיוטות", "load_error": "לא ניתן לעלות טיוטה", "empty_list": "אין כאן מידע", "deleted": "טיוטה נמחקה" From 5ac360799874a20fd06a124596dc674d72760f88 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 17 Mar 2019 20:34:39 +0200 Subject: [PATCH 85/93] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 80d8734b2..74698f600 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -66,7 +66,7 @@ "pincode": "رمز PIN", "reset": "إعادة", "nsfw_content": "محتوى NSFW", - "default_footer": "Default Footer", + "default_footer": "تذييل إفتراضي", "nsfw": { "always_show": "عرض دوماً", "always_hide": "إخفاء دوماً", From 435384e39113a9b0affed16026a25e742de4e7ca Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Mar 2019 08:48:57 +0200 Subject: [PATCH 86/93] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index 98cd14acb..e9442d164 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -65,7 +65,7 @@ "push_notification": "Obaveštenja", "pincode": "Pincode", "reset": "Resetuj", - "nsfw_content": "NSFW Content", + "nsfw_content": "NSFW sadržaj", "default_footer": "Default Footer", "nsfw": { "always_show": "Always show", @@ -186,8 +186,8 @@ }, "auth": { "invalid_pin": "Invalid pin code, please check and try again", - "invalid_username": "Invalid username, please check and try again", - "already_logged": "You are already logged in, please try to add another account", + "invalid_username": "Pogrešno korisničko ime, molimo proverite i pokušajte ponovo", + "already_logged": "Već ste prijavljeni, molimo pokušajte da dodate drugi nalog", "invalid_credentials": "Nevažeća ovlašćenja, molimo proverite i pokušajte ponovo", "unknow_error": "Nepoznata greška, molimo kontaktirajte nas na support@esteem.app" }, @@ -203,20 +203,20 @@ "reblog": "podeli", "reply": "odgovori", "share": "podeli", - "bookmarks": "add to bookmarks" + "bookmarks": "dodaj u obeleživače" }, "deep_link": { "no_existing_user": "No existing user", "no_existing_post": "No existing post" }, "search": { - "posts": "Posts", - "comments": "Comments" + "posts": "Postovi", + "comments": "Komentari" }, "comment_filter": { - "trending": "trending", - "reputation": "reputation", - "votes": "votes", - "age": "age" + "trending": "popularnosti", + "reputation": "reputaciji", + "votes": "glasovi", + "age": "starost" } } From 446146ead23754deece6caf64d1c69070698abb8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Mar 2019 09:03:49 +0200 Subject: [PATCH 87/93] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index abf5a94f7..5837b1373 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -66,7 +66,7 @@ "pincode": "Pincode", "reset": "راه اندازی مجدد", "nsfw_content": "محتوای نامناسب برای کودکان", - "default_footer": "Default Footer", + "default_footer": "پانویس پیش فرض", "nsfw": { "always_show": "همیشه نمایش بده", "always_hide": "همیشه پنهان باشد", From df363661b4eb01bc3c429eb1f8ffd24e0020c224 Mon Sep 17 00:00:00 2001 From: Mustafa Buyukcelebi Date: Mon, 18 Mar 2019 18:52:41 +0300 Subject: [PATCH 88/93] Fixed default footer error --- src/screens/application/container/applicationContainer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 2f951b51c..85251be43 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -67,6 +67,7 @@ import { setLanguage, setUpvotePercent, setNsfw, + isDefaultFooter, } from '../../../redux/actions/applicationActions'; // Container @@ -248,7 +249,7 @@ class ApplicationContainer extends Component { if (response.language !== '') dispatch(setLanguage(response.language)); if (response.server !== '') dispatch(setApi(response.server)); if (response.upvotePercent !== '') dispatch(setUpvotePercent(Number(response.upvotePercent))); - if (response.isDefaultFooter !== '') dispatch(setDefaultFooter(response.isDefaultFooter)); + if (response.isDefaultFooter !== '') dispatch(isDefaultFooter(response.isDefaultFooter)); if (response.notification !== '') { dispatch(isNotificationOpen(response.notification)); Push.setEnabled(response.notification); From 4db379b151d20385a4f753ee7bb9b690b7023a04 Mon Sep 17 00:00:00 2001 From: u-e Date: Mon, 18 Mar 2019 19:45:34 +0300 Subject: [PATCH 89/93] disabled default footer --- src/screens/settings/screen/settingsScreen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/screens/settings/screen/settingsScreen.js b/src/screens/settings/screen/settingsScreen.js index f9aa1f6d4..8b978b0b2 100644 --- a/src/screens/settings/screen/settingsScreen.js +++ b/src/screens/settings/screen/settingsScreen.js @@ -118,7 +118,7 @@ class SettingsScreen extends PureComponent { /> {!!isLoggedIn && ( - + /> */} Date: Mon, 18 Mar 2019 20:36:04 +0300 Subject: [PATCH 90/93] fixed notification bug --- src/constants/sideMenuItems.js | 2 +- .../container/notificationContainer.js | 48 ++++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/constants/sideMenuItems.js b/src/constants/sideMenuItems.js index b4a07cceb..92d0e3390 100644 --- a/src/constants/sideMenuItems.js +++ b/src/constants/sideMenuItems.js @@ -3,7 +3,7 @@ import { default as ROUTES } from './routeNames'; const authMenuItems = [ { name: 'Profile', - route: 'ProfileTabbar', + route: ROUTES.TABBAR.PROFILE, icon: 'perm-identity', id: 'profile', }, diff --git a/src/screens/notification/container/notificationContainer.js b/src/screens/notification/container/notificationContainer.js index 0034a4634..b205aaf3c 100644 --- a/src/screens/notification/container/notificationContainer.js +++ b/src/screens/notification/container/notificationContainer.js @@ -31,10 +31,8 @@ class NotificationContainer extends Component { } componentWillReceiveProps(nextProps) { - if (nextProps.activeBottomTab === ROUTES.TABBAR.NOTIFICATION) { - if (nextProps.username) { - this._getAvtivities(); - } + if (nextProps.activeBottomTab === ROUTES.TABBAR.NOTIFICATION && nextProps.username) { + this._getAvtivities(); } } @@ -60,30 +58,36 @@ class NotificationContainer extends Component { _navigateToNotificationRoute = (data) => { const { navigation, username, dispatch } = this.props; - + let routeName; + let params; + let key; markActivityAsRead(username, data.id).then((result) => { dispatch(updateUnreadActivityCount(result.unread)); }); if (data.permlink) { - navigation.navigate({ - routeName: ROUTES.SCREENS.POST, - params: { - author: data.author, - permlink: data.permlink, - isHasParentPost: data.parent_author && data.parent_permlink, - }, - key: data.permlink, - }); - } else { - navigation.navigate({ - routeName: ROUTES.SCREENS.PROFILE, - params: { - username: data.follower, - }, - key: data.follower, - }); + routeName = ROUTES.SCREENS.POST; + key = data.permlink; + params = { + author: data.author, + permlink: data.permlink, + isHasParentPost: data.parent_author && data.parent_permlink, + }; + } else if (data.type === 'follow') { + routeName = ROUTES.SCREENS.PROFILE; + key = data.follower; + params = { + username: data.follower, + }; + } else if (data.type === 'transfer') { + routeName = ROUTES.TABBAR.PROFILE; } + + navigation.navigate({ + routeName, + params, + key, + }); }; _readAllNotification = () => { From 7dc3fb8c6a46f00235c3b82d1c0839f9fb067749 Mon Sep 17 00:00:00 2001 From: u-e Date: Mon, 18 Mar 2019 21:16:09 +0300 Subject: [PATCH 91/93] voters screen bug fixed --- .../postView/container/postDisplayContainer.js | 4 +++- .../searchModal/container/searchModalContainer.js | 15 ++++++++++++--- .../searchModal/view/searchModalStyles.js | 2 +- .../searchModal/view/searchModalView.js | 7 ++++--- .../container/votersDisplayContainer.js | 15 +++++++++++++++ .../votersDisplay/view/votersDisplayView.js | 5 +++-- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/components/postView/container/postDisplayContainer.js b/src/components/postView/container/postDisplayContainer.js index cfed84c95..85be1f46b 100644 --- a/src/components/postView/container/postDisplayContainer.js +++ b/src/components/postView/container/postDisplayContainer.js @@ -34,13 +34,15 @@ class PostDisplayContainer extends Component { // Component Functions _handleOnVotersPress = (activeVotes) => { - const { navigation } = this.props; + const { navigation, post } = this.props; navigation.navigate({ routeName: ROUTES.SCREENS.VOTERS, params: { activeVotes, }, + // TODO: make unic + key: post.permlink + Math.random(), }); }; diff --git a/src/components/searchModal/container/searchModalContainer.js b/src/components/searchModal/container/searchModalContainer.js index ebe12682c..c33f16117 100644 --- a/src/components/searchModal/container/searchModalContainer.js +++ b/src/components/searchModal/container/searchModalContainer.js @@ -1,5 +1,6 @@ import React, { PureComponent } from 'react'; import { withNavigation } from 'react-navigation'; +import { connect } from 'react-redux'; // Services and Actions import { search } from '../../../providers/esteem/esteem'; @@ -45,6 +46,7 @@ class SearchModalContainer extends PureComponent { const users = res.map(item => ({ image: `https://steemitimages.com/u/${item}/avatar/small`, text: item, + ...item, })); this.setState({ searchResults: { type: 'user', data: users } }); }); @@ -52,6 +54,7 @@ class SearchModalContainer extends PureComponent { getTrendingTags(text.substr(1)).then((res) => { const tags = res.map(item => ({ text: `#${item.name}`, + ...item, })); this.setState({ searchResults: { type: 'tag', data: tags } }); @@ -63,6 +66,7 @@ class SearchModalContainer extends PureComponent { .map(item => ({ image: item.img_url || `https://steemitimages.com/u/${item.author}/avatar/small`, text: item.title, + ...item, })); this.setState({ searchResults: { type: 'content', data: res.results } }); }); @@ -71,7 +75,7 @@ class SearchModalContainer extends PureComponent { }; _handleOnPressListItem = (type, item) => { - const { navigation, handleOnClose } = this.props; + const { navigation, handleOnClose, username } = this.props; let routeName = null; let params = null; let key = null; @@ -81,7 +85,7 @@ class SearchModalContainer extends PureComponent { switch (type) { case 'user': - routeName = ROUTES.SCREENS.PROFILE; + routeName = item.text === username ? ROUTES.TABBAR.PROFILE : ROUTES.SCREENS.PROFILE; params = { username: item.text, }; @@ -118,6 +122,7 @@ class SearchModalContainer extends PureComponent { render() { const { searchResults } = this.state; const { handleOnClose, isOpen, placeholder } = this.props; + return ( ({ + username: state.account.currentAccount.name, +}); + +export default connect(mapStateToProps)(withNavigation(SearchModalContainer)); diff --git a/src/components/searchModal/view/searchModalStyles.js b/src/components/searchModal/view/searchModalStyles.js index 94485094d..7bf7601f7 100644 --- a/src/components/searchModal/view/searchModalStyles.js +++ b/src/components/searchModal/view/searchModalStyles.js @@ -67,7 +67,7 @@ export default EStyleSheet.create({ borderColor: '$primaryGray', }, searchItemText: { - color: '$white', + color: '$pureWhite', marginLeft: 10, }, }); diff --git a/src/components/searchModal/view/searchModalView.js b/src/components/searchModal/view/searchModalView.js index a7083f487..8dda2b8fe 100644 --- a/src/components/searchModal/view/searchModalView.js +++ b/src/components/searchModal/view/searchModalView.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { - View, Text, FlatList, TouchableHighlight, SafeAreaView, + View, Text, FlatList, TouchableOpacity, SafeAreaView, } from 'react-native'; import FastImage from 'react-native-fast-image'; @@ -58,7 +58,8 @@ class SearchModalView extends PureComponent { data={searchResults.data} showsVerticalScrollIndicator={false} renderItem={({ item }) => ( - handleOnPressListItem(searchResults.type, item)}> + // TODO: Make it quick ui component + handleOnPressListItem(searchResults.type, item)}> {item.image && ( @@ -74,7 +75,7 @@ class SearchModalView extends PureComponent { {item.text && {item.text}} - + )} keyExtractor={(post, index) => index.toString()} removeClippedSubviews diff --git a/src/components/votersDisplay/container/votersDisplayContainer.js b/src/components/votersDisplay/container/votersDisplayContainer.js index 4ec6fbb32..52a0b092b 100644 --- a/src/components/votersDisplay/container/votersDisplayContainer.js +++ b/src/components/votersDisplay/container/votersDisplayContainer.js @@ -1,5 +1,8 @@ import React, { PureComponent } from 'react'; +// Constants +import ROUTES from '../../../constants/routeNames'; + // Component import VotersDisplayView from '../view/votersDisplayView'; @@ -15,6 +18,18 @@ class VotersDisplayContainer extends PureComponent { this.state = {}; } + handleOnUserPress = (username) => { + const { navigation } = this.props; + + navigation.navigate({ + routeName: ROUTES.SCREENS.PROFILE, + params: { + username, + }, + key: username, + }); + }; + render() { const { votes } = this.props; diff --git a/src/components/votersDisplay/view/votersDisplayView.js b/src/components/votersDisplay/view/votersDisplayView.js index 7acd6fcb7..c3ee05850 100644 --- a/src/components/votersDisplay/view/votersDisplayView.js +++ b/src/components/votersDisplay/view/votersDisplayView.js @@ -19,7 +19,7 @@ class VotersDisplayView extends PureComponent { // Component Functions _renderItem = (item, index) => { - const { intl } = this.props; + const { handleOnUserPress } = this.props; const value = `$ ${item.value}`; const percent = `${item.percent}%`; @@ -27,11 +27,12 @@ class VotersDisplayView extends PureComponent { ); From 655e208a9d2faecf6857dff82a92c2f20d750f22 Mon Sep 17 00:00:00 2001 From: u-e Date: Mon, 18 Mar 2019 21:39:19 +0300 Subject: [PATCH 92/93] created active tab --- .../votersDisplay/container/votersDisplayContainer.js | 7 ++++--- src/components/votersDisplay/view/votersDisplayView.js | 2 +- .../notification/container/notificationContainer.js | 1 + src/screens/profile/container/profileContainer.js | 8 ++++++++ src/screens/profile/screen/profileScreen.js | 7 +++++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/votersDisplay/container/votersDisplayContainer.js b/src/components/votersDisplay/container/votersDisplayContainer.js index 52a0b092b..b68ccb0ed 100644 --- a/src/components/votersDisplay/container/votersDisplayContainer.js +++ b/src/components/votersDisplay/container/votersDisplayContainer.js @@ -1,4 +1,5 @@ import React, { PureComponent } from 'react'; +import { withNavigation } from 'react-navigation'; // Constants import ROUTES from '../../../constants/routeNames'; @@ -18,7 +19,7 @@ class VotersDisplayContainer extends PureComponent { this.state = {}; } - handleOnUserPress = (username) => { + _handleOnUserPress = (username) => { const { navigation } = this.props; navigation.navigate({ @@ -33,8 +34,8 @@ class VotersDisplayContainer extends PureComponent { render() { const { votes } = this.props; - return ; + return ; } } -export default VotersDisplayContainer; +export default withNavigation(VotersDisplayContainer); diff --git a/src/components/votersDisplay/view/votersDisplayView.js b/src/components/votersDisplay/view/votersDisplayView.js index c3ee05850..ab44c46ae 100644 --- a/src/components/votersDisplay/view/votersDisplayView.js +++ b/src/components/votersDisplay/view/votersDisplayView.js @@ -31,7 +31,7 @@ class VotersDisplayView extends PureComponent { isHasRightItem isRightColor={item.is_down_vote} rightText={value} - handleOnPress={handleOnUserPress(item.voter)} + handleOnPress={() => handleOnUserPress(item.voter)} isClickable subRightText={percent} /> diff --git a/src/screens/notification/container/notificationContainer.js b/src/screens/notification/container/notificationContainer.js index b205aaf3c..708bd6e92 100644 --- a/src/screens/notification/container/notificationContainer.js +++ b/src/screens/notification/container/notificationContainer.js @@ -81,6 +81,7 @@ class NotificationContainer extends Component { }; } else if (data.type === 'transfer') { routeName = ROUTES.TABBAR.PROFILE; + params = { isWalletTab: true }; } navigation.navigate({ diff --git a/src/screens/profile/container/profileContainer.js b/src/screens/profile/container/profileContainer.js index 8df955291..80eff17d6 100644 --- a/src/screens/profile/container/profileContainer.js +++ b/src/screens/profile/container/profileContainer.js @@ -44,12 +44,14 @@ class ProfileContainer extends Component { isReverseHeader, user: null, selectedQuickProfile: null, + activeTab: 0, }; } componentDidMount = () => { const { navigation, isLoggedIn, currentAccount } = this.props; const selectedUser = navigation.state && navigation.state.params; + const { isWalletTab } = navigation.state && navigation.state.params; if (!isLoggedIn && !selectedUser) { navigation.navigate(ROUTES.SCREENS.LOGIN); @@ -72,6 +74,10 @@ class ProfileContainer extends Component { } else { this._loadProfile(currentAccount.name); } + + if (isWalletTab) { + this.setState({ activeTab: 2 }); + } }; componentWillReceiveProps(nextProps) { @@ -328,12 +334,14 @@ class ProfileContainer extends Component { selectedQuickProfile, user, username, + activeTab, } = this.state; const { isDarkTheme, isLoggedIn, currency } = this.props; return ( ( From 7217a6aa92936ea96aeb800fa8f4cb1120bc2691 Mon Sep 17 00:00:00 2001 From: u-e Date: Mon, 18 Mar 2019 21:40:24 +0300 Subject: [PATCH 93/93] revert back --- src/screens/profile/container/profileContainer.js | 8 -------- src/screens/profile/screen/profileScreen.js | 7 ++----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/screens/profile/container/profileContainer.js b/src/screens/profile/container/profileContainer.js index 80eff17d6..8df955291 100644 --- a/src/screens/profile/container/profileContainer.js +++ b/src/screens/profile/container/profileContainer.js @@ -44,14 +44,12 @@ class ProfileContainer extends Component { isReverseHeader, user: null, selectedQuickProfile: null, - activeTab: 0, }; } componentDidMount = () => { const { navigation, isLoggedIn, currentAccount } = this.props; const selectedUser = navigation.state && navigation.state.params; - const { isWalletTab } = navigation.state && navigation.state.params; if (!isLoggedIn && !selectedUser) { navigation.navigate(ROUTES.SCREENS.LOGIN); @@ -74,10 +72,6 @@ class ProfileContainer extends Component { } else { this._loadProfile(currentAccount.name); } - - if (isWalletTab) { - this.setState({ activeTab: 2 }); - } }; componentWillReceiveProps(nextProps) { @@ -334,14 +328,12 @@ class ProfileContainer extends Component { selectedQuickProfile, user, username, - activeTab, } = this.state; const { isDarkTheme, isLoggedIn, currency } = this.props; return ( (