CLDR-17610 v46 BRS: keyboard chart rename

- rename from keyboard to keyboards, matching prior releases - the pre-45 charts were under 'keyboards/'
unicode-org · May 6, 2024 · 4953b71 · 4953b71
1 parent f9f77ba
commit 4953b71
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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 → docs/charts/keyboards/.gitignore b/docs/charts/keyboard/.gitignore → docs/charts/keyboards/.gitignore
diff --git a/docs/charts/keyboard/README.md → docs/charts/keyboards/README.md b/docs/charts/keyboard/README.md → docs/charts/keyboards/README.md
diff --git a/docs/charts/keyboard/build.mjs → docs/charts/keyboards/build.mjs b/docs/charts/keyboard/build.mjs → docs/charts/keyboards/build.mjs
diff --git a/docs/charts/keyboard/index.html → docs/charts/keyboards/index.html b/docs/charts/keyboard/index.html → docs/charts/keyboards/index.html
diff --git a/docs/charts/keyboard/package-lock.json → docs/charts/keyboards/package-lock.json b/docs/charts/keyboard/package-lock.json → docs/charts/keyboards/package-lock.json
diff --git a/docs/charts/keyboard/package.json → docs/charts/keyboards/package.json b/docs/charts/keyboard/package.json → docs/charts/keyboards/package.json
diff --git a/docs/charts/keyboard/pom.xml → docs/charts/keyboards/pom.xml b/docs/charts/keyboard/pom.xml → docs/charts/keyboards/pom.xml
diff --git a/docs/charts/keyboard/static/index.html → docs/charts/keyboards/static/index.html b/docs/charts/keyboard/static/index.html → docs/charts/keyboards/static/index.html
diff --git a/...charts/keyboard/static/keyboard-chart.css → ...harts/keyboards/static/keyboard-chart.css b/...charts/keyboard/static/keyboard-chart.css → ...harts/keyboards/static/keyboard-chart.css
diff --git a/.../charts/keyboard/static/keyboard-chart.js → ...charts/keyboards/static/keyboard-chart.js b/.../charts/keyboard/static/keyboard-chart.js → ...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
@@ -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,16 +31,16 @@ 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);
         }
         System.out.println("Copying: " + kbdStatic + " to " + staticTarg);
 
         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
@@ -44,7 +44,7 @@
 		<module>cldr-code</module>
 		<module>cldr-apps</module>
 		<module>cldr-rdf</module>
-		<module>../docs/charts/keyboard</module>
+		<module>../docs/charts/keyboards</module>
 	</modules>
 
 	<dependencyManagement>