CLDR-11535 Fixes incorrect spacing in currency examples #3976
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,5 @@ | ||
| package org.unicode.cldr.test; | ||
|
|
||
| import java.io.PrintWriter; | ||
| import java.io.StringWriter; | ||
| import java.text.ChoiceFormat; | ||
|
|
@@ -47,6 +18,7 @@ | |
| import java.util.function.Function; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import org.unicode.cldr.tool.LikelySubtags; | ||
| import org.unicode.cldr.util.AnnotationUtil; | ||
| import org.unicode.cldr.util.CLDRConfig; | ||
|
|
@@ -91,6 +63,36 @@ | |
| import org.unicode.cldr.util.personname.PersonNameFormatter.NamePattern; | ||
| import org.unicode.cldr.util.personname.SimpleNameObject; | ||
|
|
||
| import com.google.common.base.Joiner; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.ibm.icu.impl.Row.R3; | ||
| import com.ibm.icu.impl.Utility; | ||
| import com.ibm.icu.impl.number.DecimalQuantity; | ||
| import com.ibm.icu.impl.number.DecimalQuantity_DualStorageBCD; | ||
| import com.ibm.icu.lang.UCharacter; | ||
| import com.ibm.icu.text.BreakIterator; | ||
| import com.ibm.icu.text.DateFormat; | ||
| import com.ibm.icu.text.DateFormatSymbols; | ||
| import com.ibm.icu.text.DateTimePatternGenerator; | ||
| import com.ibm.icu.text.DecimalFormat; | ||
| import com.ibm.icu.text.DecimalFormatSymbols; | ||
| import com.ibm.icu.text.ListFormatter; | ||
| import com.ibm.icu.text.MessageFormat; | ||
| import com.ibm.icu.text.NumberFormat; | ||
| import com.ibm.icu.text.PluralRules; | ||
| import com.ibm.icu.text.PluralRules.DecimalQuantitySamples; | ||
| import com.ibm.icu.text.PluralRules.DecimalQuantitySamplesRange; | ||
| import com.ibm.icu.text.PluralRules.Operand; | ||
| import com.ibm.icu.text.PluralRules.SampleType; | ||
| import com.ibm.icu.text.SimpleDateFormat; | ||
| import com.ibm.icu.text.SimpleFormatter; | ||
| import com.ibm.icu.text.UTF16; | ||
| import com.ibm.icu.text.UnicodeSet; | ||
| import com.ibm.icu.util.Calendar; | ||
| import com.ibm.icu.util.Output; | ||
| import com.ibm.icu.util.TimeZone; | ||
| import com.ibm.icu.util.ULocale; | ||
|
|
||
| /** | ||
| * Class to generate examples and help messages for the Survey tool (or console version). | ||
| * | ||
|
|
@@ -2681,35 +2683,50 @@ private String handleCurrencyFormat(XPathParts parts, String value, boolean show | |
|
|
||
| String numberSystem = parts.getAttributeValue(2, "numberSystem"); // null if not present | ||
|
|
||
| String countValue = parts.getAttributeValue(-1, "count"); | ||
| if (countValue != null) { | ||
| DecimalFormat df = | ||
| icuServiceBuilder.getCurrencyFormat(currency, currencySymbol, numberSystem); | ||
| df.applyPattern(value); | ||
| return formatCountDecimal(df, countValue); | ||
| } | ||
|
|
||
| String symbol_eur; | ||
| String symbol_usd; | ||
| boolean symbol_first = value.charAt(0) == '¤'; | ||
| if (altAlpha) { | ||
| symbol_eur = "EUR"; | ||
| symbol_usd = symbol_first ? "$USD" : "USD$"; | ||
| } | ||
| else { | ||
| symbol_eur = "€"; | ||
| symbol_usd = symbol_first ? "USD$" : "$USD"; | ||
| } | ||
|
|
||
| String pattern_eur = value.replace("¤", symbol_eur); | ||
| String pattern_usd = value.replace("¤", symbol_usd); | ||
|
|
||
| DecimalFormat df_eur = icuServiceBuilder.getNumberFormat(pattern_eur, numberSystem); | ||
| DecimalFormat df_usd = icuServiceBuilder.getNumberFormat(pattern_usd, numberSystem); | ||
|
|
||
| double sampleAmount = 1295.00; | ||
| example = addExampleResult(formatNumber(df_eur, sampleAmount), example, showContexts); | ||
| example = addExampleResult(formatNumber(df_eur, -sampleAmount), example, showContexts); | ||
| example = addExampleResult(formatNumber(df_usd, sampleAmount), example, showContexts); | ||
| example = addExampleResult(formatNumber(df_usd, -sampleAmount), example, showContexts); | ||
|
|
||
| DecimalFormat df = icuServiceBuilder.getCurrencyFormat(currency, "¤", numberSystem); | ||
| df.applyPattern(value); | ||
| example = | ||
| addExampleResult( | ||
| formatNumber(df, sampleAmount).replace("¤", currencySymbol), | ||
| example, | ||
| showContexts); | ||
| example = | ||
| addExampleResult( | ||
| formatNumber(df, -sampleAmount).replace("¤", currencySymbol), | ||
| example, | ||
| showContexts); | ||
|
There was a problem hiding this comment. Where do things stand with this draft PR? it adds more examples, using df_eur and df_usd... @srl295 I see you made a more recent commit (91e1079) to this method: it returned String but is now void and ends with Emiyare also made a more recent commit (00e1fc2) inserting a few lines into this method. It looks like the old changes could be wrapped into the current code fairly easy but not just by rebasing... |
||
|
|
||
| return example; | ||
| } | ||
|
|
||
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.
Passing "¤" is ugly but seems to work since it is not one of the characters that triggers space insertion