Skip to content
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.

Sign up for GitHub

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

CLDR-17137 v44: json: fix LICENSE file #3357

Merged
merged 3 commits into from
Oct 23, 2023
Merged

CLDR-17137 v44: json: fix LICENSE file #3357

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8d24ad
CLDR-17137 json: fix LICENSE file
srl295 Oct 23, 2023
427b895
CLDR-17137 json: fix LICENSE file
srl295 Oct 23, 2023
e2deec7
CLDR-17137 spotless again
srl295 Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,31 @@
import org.unicode.cldr.draft.ScriptMetadata;
import org.unicode.cldr.draft.ScriptMetadata.Info;
import org.unicode.cldr.tool.Option.Options;
import org.unicode.cldr.util.*;
import org.unicode.cldr.util.Annotations;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRFile.DraftStatus;
import org.unicode.cldr.util.CLDRLocale;
import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.CLDRTool;
import org.unicode.cldr.util.CLDRURLS;
import org.unicode.cldr.util.CalculatedCoverageLevels;
import org.unicode.cldr.util.CldrUtility;
import org.unicode.cldr.util.CoverageInfo;
import org.unicode.cldr.util.DtdData;
import org.unicode.cldr.util.DtdType;
import org.unicode.cldr.util.Factory;
import org.unicode.cldr.util.FileCopier;
import org.unicode.cldr.util.GlossonymConstructor;
import org.unicode.cldr.util.Level;
import org.unicode.cldr.util.LocaleIDParser;
import org.unicode.cldr.util.Pair;
import org.unicode.cldr.util.PatternCache;
import org.unicode.cldr.util.StandardCodes;
import org.unicode.cldr.util.SupplementalDataInfo;
import org.unicode.cldr.util.Timer;
import org.unicode.cldr.util.XMLSource;
import org.unicode.cldr.util.XPathParts;

/**
* Utility methods to extract data from CLDR repository and export it in JSON format.
Expand Down Expand Up @@ -244,7 +267,7 @@ private class AvailableLocales {
// not be available as it is put in place by pom.xml
.add(
"license-file",
null,
'L',
".*",
"",
"Override the license file included in the bundle");
Expand Down Expand Up @@ -1246,13 +1269,14 @@ public void writeReadme(String outputDir, String packageName) throws IOException
writeReadmeSection(outf);
}
try (PrintWriter outf =
FileUtilities.openUTF8Writer(outputDir + "/" + packageName, "LICENSE"); ) {
FileUtilities.openUTF8Writer(
outputDir + "/" + packageName, CldrUtility.LICENSE); ) {
if (licenseFile.isPresent()) {
try (BufferedReader br = FileUtilities.openUTF8Reader("", licenseFile.get()); ) {
FileCopier.copy(br, outf);
}
} else {
FileCopier.copy(CldrUtility.getUTF8Data("unicode-license.txt"), outf);
FileCopier.copy(CldrUtility.getUTF8Data(CldrUtility.LICENSE), outf);
}
}
}
Expand Down
Loading