Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1014 from ONLYOFFICE/feature/fix-color-schemes

Browse source 
[DE PE SSE] Fix Bug 51465
This commit is contained in:
Julia Radzhabova 2021-07-23 16:22:20 +03:00 committed by GitHub
parent 60474c780b e4b47bc252
commit 808dc86507
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/locale/en.json
View file

@ -559,6 +559,8 @@
"txtScheme18": "Technic", "txtScheme18": "Technic",
"txtScheme19": "Trek", "txtScheme19": "Trek",
"txtScheme2": "Grayscale", "txtScheme2": "Grayscale",
"txtScheme20": "Urban",
"txtScheme21": "Verve",
"txtScheme22": "New Office", "txtScheme22": "New Office",
"txtScheme3": "Apex", "txtScheme3": "Apex",
"txtScheme4": "Aspect", "txtScheme4": "Aspect",

16
apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
View file

@ -159,20 +159,20 @@ const PageDocumentColorSchemes = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const curScheme = props.initPageColorSchemes(); const curScheme = props.initPageColorSchemes();
const [stateScheme, setScheme] = useState(curScheme); const [stateScheme, setScheme] = useState(curScheme);
const _t = t('Settings', {returnObjects: true});
const storeSettings = props.storeDocumentSettings; const storeSettings = props.storeDocumentSettings;
const allSchemes = storeSettings.allSchemes; const allSchemes = storeSettings.allSchemes;
const SchemeNames = [ const SchemeNames = [ t('Settings.txtScheme22'),
_t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, t('Settings.txtScheme1'), t('Settings.txtScheme2'), t('Settings.txtScheme3'), t('Settings.txtScheme4'),
_t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, t('Settings.txtScheme5'), t('Settings.txtScheme6'), t('Settings.txtScheme7'), t('Settings.txtScheme8'),
_t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, t('Settings.txtScheme9'), t('Settings.txtScheme10'), t('Settings.txtScheme11'), t('Settings.txtScheme12'),
_t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, t('Settings.txtScheme13'), t('Settings.txtScheme14'), t('Settings.txtScheme15'), t('Settings.txtScheme16'),
_t.txtScheme21, _t.txtScheme22 t('Settings.txtScheme17'), t('Settings.txtScheme18'), t('Settings.txtScheme19'), t('Settings.txtScheme20'),
t('Settings.txtScheme21')
]; ];
return ( return (
<Page> <Page>
<Navbar title={_t.textColorSchemes} backLink={_t.textBack} /> <Navbar title={t('Settings.textColorSchemes')} backLink={t('Settings.textBack')} />
<List> <List>
{ {
allSchemes ? allSchemes.map((scheme, index) => { allSchemes ? allSchemes.map((scheme, index) => {

2
apps/presentationeditor/mobile/locale/en.json
View file

@ -452,6 +452,8 @@
"txtScheme18": "Technic", "txtScheme18": "Technic",
"txtScheme19": "Trek", "txtScheme19": "Trek",
"txtScheme2": "Grayscale", "txtScheme2": "Grayscale",
"txtScheme20": "Urban",
"txtScheme21": "Verve",
"txtScheme22": "New Office", "txtScheme22": "New Office",
"txtScheme3": "Apex", "txtScheme3": "Apex",
"txtScheme4": "Aspect", "txtScheme4": "Aspect",

16
apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
View file

@ -35,20 +35,20 @@ const PagePresentationColorSchemes = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const curScheme = props.initPageColorSchemes(); const curScheme = props.initPageColorSchemes();
const [stateScheme, setScheme] = useState(curScheme); const [stateScheme, setScheme] = useState(curScheme);
const _t = t('View.Settings', {returnObjects: true});
const storePresentationSettings = props.storePresentationSettings; const storePresentationSettings = props.storePresentationSettings;
const allSchemes = storePresentationSettings.allSchemes; const allSchemes = storePresentationSettings.allSchemes;
const SchemeNames = [ const SchemeNames = [ t('View.Settings.txtScheme22'),
_t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, t('View.Settings.txtScheme1'), t('View.Settings.txtScheme2'), t('View.Settings.txtScheme3'), t('View.Settings.txtScheme4'),
_t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, t('View.Settings.txtScheme5'), t('View.Settings.txtScheme6'), t('View.Settings.txtScheme7'), t('View.Settings.txtScheme8'),
_t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, t('View.Settings.txtScheme9'), t('View.Settings.txtScheme10'), t('View.Settings.txtScheme11'), t('View.Settings.txtScheme12'),
_t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, t('View.Settings.txtScheme13'), t('View.Settings.txtScheme14'), t('View.Settings.txtScheme15'), t('View.Settings.txtScheme16'),
_t.txtScheme21, _t.txtScheme22 t('View.Settings.txtScheme17'), t('View.Settings.txtScheme18'), t('View.Settings.txtScheme19'), t('View.Settings.txtScheme20'),
t('View.Settings.txtScheme21')
]; ];
return ( return (
<Page> <Page>
<Navbar title={_t.textColorSchemes} backLink={_t.textBack} /> <Navbar title={t('View.Settings.textColorSchemes')} backLink={t('View.Settings.textBack')} />
<List> <List>
{ {
allSchemes ? allSchemes.map((scheme, index) => { allSchemes ? allSchemes.map((scheme, index) => {

2
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -619,6 +619,8 @@
"txtScheme18": "Technic", "txtScheme18": "Technic",
"txtScheme19": "Trek", "txtScheme19": "Trek",
"txtScheme2": "Grayscale", "txtScheme2": "Grayscale",
"txtScheme20": "Urban",
"txtScheme21": "Verve",
"txtScheme22": "New Office", "txtScheme22": "New Office",
"txtScheme3": "Apex", "txtScheme3": "Apex",
"txtScheme4": "Aspect", "txtScheme4": "Aspect",

16
apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
View file

@ -8,20 +8,20 @@ const PageSpreadsheetColorSchemes = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const curScheme = props.initPageColorSchemes(); const curScheme = props.initPageColorSchemes();
const [stateScheme, setScheme] = useState(curScheme); const [stateScheme, setScheme] = useState(curScheme);
const _t = t('View.Settings', {returnObjects: true});
const storeSpreadsheetSettings = props.storeSpreadsheetSettings; const storeSpreadsheetSettings = props.storeSpreadsheetSettings;
const allSchemes = storeSpreadsheetSettings.allSchemes; const allSchemes = storeSpreadsheetSettings.allSchemes;
const SchemeNames = [ const SchemeNames = [ t('View.Settings.txtScheme22'),
_t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, t('View.Settings.txtScheme1'), t('View.Settings.txtScheme2'), t('View.Settings.txtScheme3'), t('View.Settings.txtScheme4'),
_t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, t('View.Settings.txtScheme5'), t('View.Settings.txtScheme6'), t('View.Settings.txtScheme7'), t('View.Settings.txtScheme8'),
_t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, t('View.Settings.txtScheme9'), t('View.Settings.txtScheme10'), t('View.Settings.txtScheme11'), t('View.Settings.txtScheme12'),
_t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, t('View.Settings.txtScheme13'), t('View.Settings.txtScheme14'), t('View.Settings.txtScheme15'), t('View.Settings.txtScheme16'),
_t.txtScheme21, _t.txtScheme22 t('View.Settings.txtScheme17'), t('View.Settings.txtScheme18'), t('View.Settings.txtScheme19'), t('View.Settings.txtScheme20'),
t('View.Settings.txtScheme21')
]; ];
return ( return (
<Page> <Page>
<Navbar title={_t.textColorSchemes} backLink={_t.textBack} /> <Navbar title={t('View.Settings.textColorSchemes')} backLink={t('View.Settings.textBack')} />
<List> <List>
{ {
allSchemes ? allSchemes.map((scheme, index) => { allSchemes ? allSchemes.map((scheme, index) => {