From 4953b710fe59151c095bb63173eeb599f87b3fcf Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 6 May 2024 18:41:13 -0500 Subject: [PATCH] CLDR-17610 v46 BRS: keyboard chart rename - rename from keyboard to keyboards, matching prior releases - the pre-45 charts were under 'keyboards/' --- .github/workflows/gh-pages.yml | 2 +- docs/_config.yml | 4 ++-- docs/charts/{keyboard => keyboards}/.gitignore | 0 docs/charts/{keyboard => keyboards}/README.md | 0 docs/charts/{keyboard => keyboards}/build.mjs | 0 docs/charts/{keyboard => keyboards}/index.html | 0 docs/charts/{keyboard => keyboards}/package-lock.json | 0 docs/charts/{keyboard => keyboards}/package.json | 0 docs/charts/{keyboard => keyboards}/pom.xml | 0 docs/charts/{keyboard => keyboards}/static/index.html | 0 .../{keyboard => keyboards}/static/keyboard-chart.css | 0 .../{keyboard => keyboards}/static/keyboard-chart.js | 0 .../org/unicode/cldr/tool/GenerateKeyboardCharts.java | 10 ++++++---- tools/pom.xml | 2 +- 14 files changed, 10 insertions(+), 8 deletions(-) rename docs/charts/{keyboard => keyboards}/.gitignore (100%) rename docs/charts/{keyboard => keyboards}/README.md (100%) rename docs/charts/{keyboard => keyboards}/build.mjs (100%) rename docs/charts/{keyboard => keyboards}/index.html (100%) rename docs/charts/{keyboard => keyboards}/package-lock.json (100%) rename docs/charts/{keyboard => keyboards}/package.json (100%) rename docs/charts/{keyboard => keyboards}/pom.xml (100%) rename docs/charts/{keyboard => keyboards}/static/index.html (100%) rename docs/charts/{keyboard => keyboards}/static/keyboard-chart.css (100%) rename docs/charts/{keyboard => keyboards}/static/keyboard-chart.js (100%) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 23956cb570c..aaf05274549 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -38,7 +38,7 @@ jobs: # Note: will update ToC if out of date run: 'cd tools/scripts/tr-archive/ && npm ci && npm run build' - name: Run Kbd Charts - run: 'cd docs/charts/keyboard && npm ci && npm run build' + run: 'cd docs/charts/keyboards && npm ci && npm run build' - name: Upload tr35.zip uses: actions/upload-artifact@v4 with: diff --git a/docs/_config.yml b/docs/_config.yml index 4d39a2562bb..62df1eb0dde 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -11,8 +11,8 @@ ga_tracking: UA-7672775-1 ga_tracking_anonymize_ip: true # Use GDPR compliant Google Analytics settings exclude: - - charts/keyboard/node_modules - - charts/keyboard/node + - charts/keyboards/node_modules + - charts/keyboards/node - ldml #include: diff --git a/docs/charts/keyboard/.gitignore b/docs/charts/keyboards/.gitignore similarity index 100% rename from docs/charts/keyboard/.gitignore rename to docs/charts/keyboards/.gitignore diff --git a/docs/charts/keyboard/README.md b/docs/charts/keyboards/README.md similarity index 100% rename from docs/charts/keyboard/README.md rename to docs/charts/keyboards/README.md diff --git a/docs/charts/keyboard/build.mjs b/docs/charts/keyboards/build.mjs similarity index 100% rename from docs/charts/keyboard/build.mjs rename to docs/charts/keyboards/build.mjs diff --git a/docs/charts/keyboard/index.html b/docs/charts/keyboards/index.html similarity index 100% rename from docs/charts/keyboard/index.html rename to docs/charts/keyboards/index.html diff --git a/docs/charts/keyboard/package-lock.json b/docs/charts/keyboards/package-lock.json similarity index 100% rename from docs/charts/keyboard/package-lock.json rename to docs/charts/keyboards/package-lock.json diff --git a/docs/charts/keyboard/package.json b/docs/charts/keyboards/package.json similarity index 100% rename from docs/charts/keyboard/package.json rename to docs/charts/keyboards/package.json diff --git a/docs/charts/keyboard/pom.xml b/docs/charts/keyboards/pom.xml similarity index 100% rename from docs/charts/keyboard/pom.xml rename to docs/charts/keyboards/pom.xml diff --git a/docs/charts/keyboard/static/index.html b/docs/charts/keyboards/static/index.html similarity index 100% rename from docs/charts/keyboard/static/index.html rename to docs/charts/keyboards/static/index.html diff --git a/docs/charts/keyboard/static/keyboard-chart.css b/docs/charts/keyboards/static/keyboard-chart.css similarity index 100% rename from docs/charts/keyboard/static/keyboard-chart.css rename to docs/charts/keyboards/static/keyboard-chart.css diff --git a/docs/charts/keyboard/static/keyboard-chart.js b/docs/charts/keyboards/static/keyboard-chart.js similarity index 100% rename from docs/charts/keyboard/static/keyboard-chart.js rename to docs/charts/keyboards/static/keyboard-chart.js diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateKeyboardCharts.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateKeyboardCharts.java index afbf503062f..90fbc550ebe 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateKeyboardCharts.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateKeyboardCharts.java @@ -9,6 +9,8 @@ public class GenerateKeyboardCharts { + static final String SUBDIR = "keyboards"; + public static void main(String args[]) throws IOException { final File mainDir = new File(CLDRPaths.CHART_DIRECTORY); if (mainDir.mkdirs()) { @@ -17,7 +19,7 @@ public static void main(String args[]) throws IOException { if (!mainDir.isDirectory()) { throw new IOException("Main dir doesn't exist: " + mainDir); } - final File kbdDir = new File(CLDRPaths.BASE_DIRECTORY, "docs/charts/keyboard"); + final File kbdDir = new File(CLDRPaths.BASE_DIRECTORY, "docs/charts/" + SUBDIR); if (!kbdDir.exists()) { throw new IOException("Keyboards root dir doesn't exist: " + kbdDir); } @@ -29,8 +31,8 @@ public static void main(String args[]) throws IOException { System.err.println("See " + new File(kbdDir, "README.md") + " for help."); return; } - final File staticTarg = new File(mainDir, "keyboard/static"); - final File staticDataTarg = new File(mainDir, "keyboard/static/data"); + final File staticTarg = new File(mainDir, SUBDIR + "/static"); + final File staticDataTarg = new File(mainDir, SUBDIR + "/static/data"); if (staticDataTarg.mkdirs()) { System.err.println("Created: " + staticDataTarg); } @@ -38,7 +40,7 @@ public static void main(String args[]) throws IOException { Files.copy( new File(kbdDir, "index.html").toPath(), - new File(mainDir, "keyboard/index.html").toPath(), + new File(mainDir, SUBDIR + "/index.html").toPath(), StandardCopyOption.REPLACE_EXISTING); final String kbdStaticPrefix = kbdStatic.getAbsolutePath(); Files.walk(kbdStatic.toPath()) diff --git a/tools/pom.xml b/tools/pom.xml index 1995b6e9a6d..06788194b66 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -44,7 +44,7 @@ cldr-code cldr-apps cldr-rdf - ../docs/charts/keyboard + ../docs/charts/keyboards