Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b509588a
Commit
b509588a
authored
Sep 26, 2017
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add basic sprintf implementation to JavaScript
parent
92173ac5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
119 additions
and
2 deletions
+119
-2
app/assets/javascripts/locale/index.js
app/assets/javascripts/locale/index.js
+3
-0
app/assets/javascripts/locale/sprintf.js
app/assets/javascripts/locale/sprintf.js
+26
-0
app/assets/javascripts/vue_shared/translate.js
app/assets/javascripts/vue_shared/translate.js
+2
-0
changelogs/unreleased/winh-sprintf.yml
changelogs/unreleased/winh-sprintf.yml
+5
-0
doc/development/i18n_guide.md
doc/development/i18n_guide.md
+9
-2
spec/javascripts/locale/sprintf_spec.js
spec/javascripts/locale/sprintf_spec.js
+74
-0
No files found.
app/assets/javascripts/locale/index.js
View file @
b509588a
import
Jed
from
'
jed
'
;
import
sprintf
from
'
./sprintf
'
;
/**
This is required to require all the translation folders in the current directory
this saves us having to do this manually & keep up to date with new languages
...
...
@@ -67,4 +69,5 @@ export { lang };
export
{
gettext
as
__
};
export
{
ngettext
as
n__
};
export
{
pgettext
as
s__
};
export
{
sprintf
};
export
default
locale
;
app/assets/javascripts/locale/sprintf.js
0 → 100644
View file @
b509588a
import
_
from
'
underscore
'
;
/**
Very limited implementation of sprintf supporting only named parameters.
@param input (translated) text with parameters (e.g. '%{num_users} users use us')
@param parameters object mapping parameter names to values (e.g. { num_users: 5 })
@param escapeParameters whether parameter values should be escaped (see http://underscorejs.org/#escape)
@returns {String} the text with parameters replaces (e.g. '5 users use us')
@see https://ruby-doc.org/core-2.3.3/Kernel.html#method-i-sprintf
@see https://gitlab.com/gitlab-org/gitlab-ce/issues/37992
**/
export
default
(
input
,
parameters
,
escapeParameters
=
true
)
=>
{
let
output
=
input
;
if
(
parameters
)
{
Object
.
keys
(
parameters
).
forEach
((
parameterName
)
=>
{
const
parameterValue
=
parameters
[
parameterName
];
const
escapedParameterValue
=
escapeParameters
?
_
.
escape
(
parameterValue
)
:
parameterValue
;
output
=
output
.
replace
(
new
RegExp
(
`%{
${
parameterName
}
}`
,
'
g
'
),
escapedParameterValue
);
});
}
return
output
;
}
app/assets/javascripts/vue_shared/translate.js
View file @
b509588a
...
...
@@ -2,6 +2,7 @@ import {
__
,
n__
,
s__
,
sprintf
,
}
from
'
../locale
'
;
export
default
(
Vue
)
=>
{
...
...
@@ -37,6 +38,7 @@ export default (Vue) => {
@returns {String} Translated context based text
**/
s__
,
sprintf
,
},
});
};
changelogs/unreleased/winh-sprintf.yml
0 → 100644
View file @
b509588a
---
title
:
Add basic sprintf implementation to JavaScript
merge_request
:
14506
author
:
type
:
other
doc/development/i18n_guide.md
View file @
b509588a
...
...
@@ -183,13 +183,20 @@ aren't in the message with id `1 pipeline`.
### Interpolation
-
In Ruby/HAML:
-
In Ruby/HAML
(see [sprintf])
:
```ruby
_("Hello %{name}") % { name: 'Joe' }
```
-
In JavaScript: Not supported at this moment.
-
In JavaScript: Only named parameters are supported (see also [#37992]):
```javascript
__("Hello %{name}") % { name: 'Joe' }
```
[
sprintf
]:
http://ruby-doc.org/core/Kernel.html#method-i-sprintf
[
#37992
]:
https://gitlab.com/gitlab-org/gitlab-ce/issues/37992
### Plurals
...
...
spec/javascripts/locale/sprintf_spec.js
0 → 100644
View file @
b509588a
import
sprintf
from
'
~/locale/sprintf
'
;
describe
(
'
locale
'
,
()
=>
{
describe
(
'
sprintf
'
,
()
=>
{
it
(
'
does not modify string without parameters
'
,
()
=>
{
const
input
=
'
No parameters
'
;
const
output
=
sprintf
(
input
);
expect
(
output
).
toBe
(
input
);
});
it
(
'
ignores extraneous parameters
'
,
()
=>
{
const
input
=
'
No parameters
'
;
const
output
=
sprintf
(
input
,
{
ignore
:
'
this
'
});
expect
(
output
).
toBe
(
input
);
});
it
(
'
ignores extraneous placeholders
'
,
()
=>
{
const
input
=
'
No %{parameters}
'
;
const
output
=
sprintf
(
input
);
expect
(
output
).
toBe
(
input
);
});
it
(
'
replaces parameters
'
,
()
=>
{
const
input
=
'
%{name} has %{count} parameters
'
;
const
parameters
=
{
name
:
'
this
'
,
count
:
2
,
};
const
output
=
sprintf
(
input
,
parameters
);
expect
(
output
).
toBe
(
'
this has 2 parameters
'
);
});
it
(
'
replaces multiple occurrences
'
,
()
=>
{
const
input
=
'
to %{verb} or not to %{verb}
'
;
const
parameters
=
{
verb
:
'
be
'
,
};
const
output
=
sprintf
(
input
,
parameters
);
expect
(
output
).
toBe
(
'
to be or not to be
'
);
});
it
(
'
escapes parameters
'
,
()
=>
{
const
input
=
'
contains %{userContent}
'
;
const
parameters
=
{
userContent
:
'
<script>alert("malicious!")</script>
'
,
};
const
output
=
sprintf
(
input
,
parameters
);
expect
(
output
).
toBe
(
'
contains <script>alert("malicious!")</script>
'
);
});
it
(
'
does not escape parameters for escapeParameters = false
'
,
()
=>
{
const
input
=
'
contains %{safeContent}
'
;
const
parameters
=
{
safeContent
:
'
<strong>bold attempt</strong>
'
,
};
const
output
=
sprintf
(
input
,
parameters
,
false
);
expect
(
output
).
toBe
(
'
contains <strong>bold attempt</strong>
'
);
});
});
});
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