Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
Taiko Web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Taiko Web
Commits
41ddbb66
Commit
41ddbb66
authored
Apr 26, 2020
by
mnvdk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
load category strings in its own object instead of just overwriting everything
parent
f66ef641
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
public/src/js/strings.js
public/src/js/strings.js
+7
-8
public/src/js/titlescreen.js
public/src/js/titlescreen.js
+3
-3
No files found.
public/src/js/strings.js
View file @
41ddbb66
...
...
@@ -1074,11 +1074,11 @@ var translations = {
}
}
var
categories
=
{}
var
allStrings
=
{}
var
categoryStrings
=
{}
function
separateStrings
(){
let
categoriesTemp
=
Object
.
assign
({},
categories
);
categories
=
{}
for
(
var
j
in
languageList
){
var
lang
=
languageList
[
j
]
...
...
@@ -1106,12 +1106,11 @@ function separateStrings(){
translateObj
(
translations
[
i
],
i
,
str
)
}
categories
[
lang
]
=
{
id
:
lang
}
var
str
=
categories
[
lang
]
for
(
var
i
in
categoriesTemp
){
translateObj
(
categoriesTemp
[
i
],
i
,
str
)
categoryStrings
[
lang
]
=
{}
var
str
=
categoryStrings
[
lang
]
for
(
var
i
in
categories
){
translateObj
(
categories
[
i
],
i
,
str
)
}
}
}
public/src/js/titlescreen.js
View file @
41ddbb66
...
...
@@ -78,13 +78,13 @@ class Titlescreen{
}
setLang
(){
let
stringLang
=
allStrings
[
settings
.
getItem
(
"
language
"
)]
let
categoryLang
=
categor
ie
s
[
settings
.
getItem
(
"
language
"
)]
let
categoryLang
=
categor
yString
s
[
settings
.
getItem
(
"
language
"
)]
strings
=
stringLang
strings
.
categories
=
categoryLang
settings
.
setLang
(
stringLang
,
true
,
allStrings
)
settings
.
setLang
(
categoryLang
,
true
,
categor
ie
s
)
settings
.
setLang
(
categoryLang
,
true
,
categor
yString
s
)
let
boldFonts
=
strings
.
font
===
"
Microsoft YaHei, sans-serif
"
loader
.
screen
.
style
.
fontFamily
=
strings
.
font
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment