move english strings to bundle.properties#5341
Merged
kcondon merged 44 commits intoIQSS:developfrom Dec 3, 2018
Merged
Conversation
Translation of English terms found in bundle.properties from latest "develop" code. Fixes for new and modified variables.
Minor fixes for various variables now that I can better see them in context (that is by toggling between interfaces),
for permission.roleWas
Updated French translation - Oct 17th.
…sportal/dataverse into 4856_FrenchPropertyFiles
Again, a few more fixes to the French interface now that this is seen in context.
4856 french property files
Additional translations in French for all new and/or modified English terms/variables for all Commits between ~Oct 12th 2018 to Nov 8th 2018. (https://github.com/scholarsportal/dataverse/commits/4856_FrenchPropertyFiles/src/main/java/Bundle.properties)
Additional translations in French
mheppler
approved these changes
Nov 27, 2018
Contributor
mheppler
left a comment
mheppler
left a comment
There was a problem hiding this comment.
Looks good. Approved. Moving to QA.
Contributor
|
@JayanthyChengan Can you please resolve the branch conflicts? I've already reviewed/tested this so it is ready to be merged. Thanks! This can wait until next week as I'm going home shortly, have a nice weekend! |
…remove-english-strings # Conflicts: # src/main/java/Bundle.properties
Contributor
Author
|
@kcondon , resolved the conflicts and merged latest "develop" branch. |
Contributor
|
@JayanthyChengan Thanks! Merging. |
This was referenced Dec 7, 2018
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Found more english strings in xhtml and java files which has to be moved to bundle.properties
Related Issues
Internationalization : Move English strings from xhtml to bundle.properties, Phase 2 #4672
Internationalization : remove English static strings from Java files to bundle.properties #4680