This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
Add t() translation mark to i18nable strings and update translations #1593
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jespino
commented
Aug 21, 2018
| @@ -153,7 +153,7 @@ export default class Root extends React.Component { | |||
|
|
|||
| /*eslint-disable */ | |||
| if (segmentKey != null && segmentKey !== '' && this.props.diagnosticsEnabled) { | |||
| !function(){var analytics=global.window.analytics=global.window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","group","track","ready","alias","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http:https://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="3.0.1"; | |||
| !function(){var analytics=global.window.analytics=global.window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","group","track","ready","alias","page","once","off","on"];analytics.factory=function(t){return function(...args){var e=Array.prototype.slice.call(args);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http:https://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="3.0.1"; | |||
There was a problem hiding this comment.
This is changed because the acorn parser doesn't likes the arguments keyword.
enahum
approved these changes
Aug 22, 2018
|
Rebase needed |
jwilander
approved these changes
Aug 22, 2018
jwilander
added
4: Reviews Complete
|
Rebased. |
|
@jespino What's the plan for making sure this merges 100% correctly? Should we hold merging PRs while you update it and make sure there are no conflicts? I was just reviewing a PR that adds translation strings, so I don't know if it's safe to merge that yet |
|
It is not safe to merge it directly. I going to rebase it properly (taking into account changes between the last rebase and the current base). Basically I'll go through the changes one by one, reviewing that all introduced strings are tagged or automatically extracted. We won't merge it until the next release-branch cut, so we can merge into master and give it as much time as possible to test it properly in pre-release. |
hmhealey
added
Do Not Merge/Awaiting Next Release
jespino
force-pushed
the
i18n-extract
branch
from
38ccfe5
to
0b8b2f5
Compare
jasonblais
removed
the
Do Not Merge/Awaiting Next Release
jespino
force-pushed
the
i18n-extract
branch
5 times, most recently
from
67fadd5
to
281551c
Compare
jespino
force-pushed
the
i18n-extract
branch
from
281551c
to
3e87031
Compare
enahum
added
4: Reviews Complete
amyblais
added
Changelog/Not Needed
fincha
pushed a commit
to fincha/mattermost-webapp
that referenced
this pull request
Oct 21, 2018
…attermost#1593) * Add t() translation mark to i18nable strings and update translations * Add 'Search Gfycat' string translation * More translation fixes
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
I added a mark for every single string that needs to be translate and
isn't directly in a
localizeMessage,FormattedMessageor othersimilar block.
After that I used the mmjstool to extract the i18n strings in the code.
Ticket Link
MM-11273
Checklist
make check-styleto check for style errors (required for all pull requests)make testto ensure unit and component tests passed