Skip to main content
Homepage
Explore
Search or go to…
/
Sign in
Explore
Primary navigation
Project
F
fenix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
fenix
Commits
4a7a5f7b
This project is archived. Its data is
read-only
.
Unverified
Commit
4a7a5f7b
authored
Oct 13, 2020
by
Matthew Finkel
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'gkgl/bug_40083' into tor-browser-82.0.0b4-10.0-1
parents
1e797f95
0c537f77
No related branches found
No related tags found
1 merge request
!41
Bug 40083
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/build.gradle
+8
-2
8 additions, 2 deletions
app/build.gradle
with
8 additions
and
2 deletions
app/build.gradle
+
8
−
2
View file @
4a7a5f7b
...
...
@@ -585,16 +585,22 @@ task buildTranslationArray {
// This isn't running as a task, instead the array is build when the gradle file is parsed.
// https://github.com/mozilla-mobile/fenix/issues/14175
def
foundLocales
=
new
StringBuilder
()
def
languageCodes
=
[]
foundLocales
.
append
(
"new String[]{"
)
fileTree
(
"src/main/res"
).
visit
{
FileVisitDetails
details
->
if
(
details
.
file
.
path
.
endsWith
(
"/strings.xml"
)){
def
languageCode
=
details
.
file
.
parent
.
tokenize
(
'/'
).
last
().
replaceAll
(
'values-'
,
''
).
replaceAll
(
'-r'
,
'-'
)
languageCode
=
(
languageCode
==
"values"
)
?
"en-US"
:
languageCode
foundLocales
.
append
(
"\""
).
append
(
languageCode
).
append
(
"\""
).
append
(
","
)
languageCodes
.
add
(
languageCode
)
}
}
// The order of files in a `FileTree` is not stable, even on a single
// computer. Thus we need to sort the `languageCode`s. See: fenix#40083.
languageCodes
.
sort
()
languageCodes
.
each
{
foundLocales
.
append
(
"\""
).
append
(
it
).
append
(
"\""
).
append
(
","
)
}
foundLocales
.
append
(
"}"
)
def
foundLocalesString
=
foundLocales
.
toString
().
replaceAll
(
',}'
,
'}'
)
android
.
defaultConfig
.
buildConfigField
"String[]"
,
"SUPPORTED_LOCALE_ARRAY"
,
foundLocalesString
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment