Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
persona
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hexang 息壤平台
persona
Commits
cbb2dd60
Commit
cbb2dd60
authored
12 years ago
by
Lloyd Hilaiel
Browse files
Options
Downloads
Patches
Plain Diff
Revert "ignore en_US in i18n - GH-1905 & GH-1675"
This reverts commit
f65ee501
.
parent
a5ef05dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/i18n.js
+2
-5
2 additions, 5 deletions
lib/i18n.js
with
2 additions
and
5 deletions
lib/i18n.js
+
2
−
5
View file @
cbb2dd60
...
...
@@ -70,9 +70,7 @@ exports.abide = function (options) {
json_exists
:
path
.
existsSync
(
json_file_path
(
l
)),
gt
:
null
};
// english translations are broken and not maintained, hence the second part of
// this if statement - see issue #1912
if
(
l
!==
debug_locale
&&
l
!==
'
en_US
'
)
{
if
(
l
!==
debug_locale
)
{
if
(
!
mo_cache
[
l
]
||
!
mo_cache
[
l
].
mo_exists
||
!
mo_cache
[
l
].
json_exists
)
{
var
msg
=
util
.
format
(
'
Bad locale=[%s] file(s) do not exist [%s] or [%s]. See locale/README
'
,
l
,
mo_file_path
(
l
),
json_file_path
(
l
));
...
...
@@ -114,8 +112,7 @@ exports.abide = function (options) {
resp
.
local
(
'
format
'
,
format
);
req
.
format
=
format
;
// ignore translation files in en_US - see issue #1905
if
(
mo_cache
[
locale
].
mo_exists
&&
locale
!=
'
en_US
'
)
{
if
(
mo_cache
[
locale
].
mo_exists
)
{
if
(
mo_cache
[
locale
].
gt
===
null
)
{
mo_cache
[
locale
].
gt
=
new
Gettext
();
var
mo_path
=
mo_file_path
(
locale
);
...
...
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
register
or
sign in
to comment