-
-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Additional I18n APIs. #12
Draft
prokopyl
wants to merge
11
commits into
master
Choose a base branch
from
feature-new-i18n
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
8e04a2b
Started working on additional I18n APIs.
prokopyl 53cafc1
Merge branch 'master' into feature-new-i18n
prokopyl fa53d42
Added I18nText integration to ItemStackBuilder and GUI APIs.
prokopyl 23ffa83
Added I18nText integration to the RawText API, and affiliates.
prokopyl d3da46c
* BUG: RawTextPart: hover() now correctly handles Locales.
prokopyl 451a038
Added I18nText integration to the Commands API.
prokopyl ad1fab8
Merge branch 'master' into feature-new-i18n
AmauryCarrade b7b0a28
Merge branch 'master' of github.com:zDevelopers/zLib into feature-new…
prokopyl 5d1e035
Renamed class I18nText to LazyTranslation
prokopyl 27e29b3
Renamed method I.t to I.l to match LazyTranslation
prokopyl 0b8ae14
Various minor changes
prokopyl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -647,6 +647,11 @@ public static String translate(String context, String messageId, String messageI | |
return translate(null, context, messageId, messageIdPlural, count, parameters); | ||
} | ||
|
||
public static String translate(Locale locale, I18nText text, Object... parameters) | ||
{ | ||
return translate(null, text.getContext(), text.getMessageId(), text.getMessageId(), text.getCount(), parameters); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. return translate(null, text.getContext(), text.getMessageId(), /* → */ text.getPluralMessageId(), /* ← */ text.getCount(), parameters); ? |
||
} | ||
|
||
/** | ||
* Replaces some formatting codes into system codes. | ||
* | ||
|
84 changes: 84 additions & 0 deletions
84
src/main/java/fr/zcraft/zlib/components/i18n/I18nText.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/* | ||
* Copyright or © or Copr. ZLib contributors (2015 - 2016) | ||
* | ||
* This software is governed by the CeCILL-B license under French law and | ||
* abiding by the rules of distribution of free software. You can use, | ||
* modify and/ or redistribute the software under the terms of the CeCILL-B | ||
* license as circulated by CEA, CNRS and INRIA at the following URL | ||
* "http://www.cecill.info". | ||
* | ||
* As a counterpart to the access to the source code and rights to copy, | ||
* modify and redistribute granted by the license, users are provided only | ||
* with a limited warranty and the software's author, the holder of the | ||
* economic rights, and the successive licensors have only limited | ||
* liability. | ||
* | ||
* In this respect, the user's attention is drawn to the risks associated | ||
* with loading, using, modifying and/or developing or reproducing the | ||
* software by the user in light of its specific status of free software, | ||
* that may mean that it is complicated to manipulate, and that also | ||
* therefore means that it is reserved for developers and experienced | ||
* professionals having in-depth computer knowledge. Users are therefore | ||
* encouraged to load and test the software's suitability as regards their | ||
* requirements in conditions enabling the security of their systems and/or | ||
* data to be ensured and, more generally, to use and operate it in the | ||
* same conditions as regards security. | ||
* | ||
* The fact that you are presently reading this means that you have had | ||
* knowledge of the CeCILL-B license and that you accept its terms. | ||
*/ | ||
|
||
package fr.zcraft.zlib.components.i18n; | ||
|
||
public class I18nText | ||
{ | ||
private final String messageId; | ||
private final String pluralMessageId; | ||
private final Integer count; | ||
private final String context; | ||
|
||
private Object[] parameters; | ||
|
||
public I18nText(String messageId, String pluralMessageId, Integer count, String context) | ||
{ | ||
this.messageId = messageId; | ||
this.pluralMessageId = pluralMessageId; | ||
this.count = count; | ||
this.context = context; | ||
} | ||
|
||
public I18nText(String messageId) | ||
{ | ||
this(messageId, null, null, null); | ||
} | ||
|
||
public String getMessageId() | ||
{ | ||
return messageId; | ||
} | ||
|
||
public String getPluralMessageId() | ||
{ | ||
return pluralMessageId; | ||
} | ||
|
||
public Integer getCount() | ||
{ | ||
return count; | ||
} | ||
|
||
public String getContext() | ||
{ | ||
return context; | ||
} | ||
|
||
public Object[] getParameters() | ||
{ | ||
return parameters; | ||
} | ||
|
||
public void setParameters(Object[] parameters) | ||
{ | ||
this.parameters = parameters; | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Javadoc manquante (pas que là d'ailleurs mais je ne vais pas mettre un commentaire par méthode)