Skip to content

Commit

Permalink
CLDR-15034 keyboard maint 43 (#2872)
Browse files Browse the repository at this point in the history
* CLDR-16192 Admin email encoding failure for non-ASCII text (#2599)

-Simply return parameter unchanged for WebContext.decodeFieldString

-Comments

* CLDR-11368 Enable Forum posting by TC even when read-only (#2754)

-Revise SurveyForum.userCanUsePostType, isPhaseReadonly only matters for non-TC

-Refactor with boolean isTC to avoid calling userIsTC repeatedly

* CLDR-16437 v44 BRS: dependabot bump for v44 (#2753)

* CLDR-16437 gh:(deps): Bump actions/cache from 2 to 3 (#2757)

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 j:(deps): Bump json from 20190722 to 20230227 in /tools (#2756)

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20230227.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16373 v43 BRS: json, fix personNames, unitIdComponents (#2760)

* CLDR-16438 C document filtering out unneeded data (#2766)

* CLDR-16438 C document filtering out unneeded data

* CLDR-16438 Add main section

* CLDR-16438 Restore previous changes

* CLDR-16433 Document changes in person names (#2765)

* CLDR-16433 Document changes in person names

* CLDR-16433 fix coalescing

And some of the malformed links (more to come)

* CLDR-16433 clean up remaining malformed links

and examples

* CLDR-16433 Update the section on names without spaces

* CLDR-16433 Remove @Techpreview from the dtd

* CLDR-8956 add tool for missing dtd items in spec (#2764)

* CLDR-8956 Add tool for checking dtd items in ldml spec

* CLDR-8956 accept suggestion

Co-authored-by: Steven R. Loomis <srl295@gmail.com>

---------

Co-authored-by: Steven R. Loomis <srl295@gmail.com>

* CLDR-16433 Clean up language around spaceReplacement (#2768)

* CLDR-16433 Clean up language around spaceReplacement

* CLDR-16433 Refine the script determination

Rich, I tried new language for the script determination, to incorporate your method but added a bit to catch edge cases. See what you think.

* CLDR-16433 Fix hanging chad

* CLDR-16433 Revise as per discussion

* CLDR-16433 Another cleanup pass

* CLDR-16433 fix typos, add empty surname handling

* CLDR-16433 Clean up TOC, add handling core and prefix

I realized that there wasn't a discussion of the core and prefix, so added another section. Also reorganized the structure a bit so that the flow was top to bottom, and fixed the TOC.

* CLDR-16433 More cleanup

Have to commit to see the rich text diff, so sometimes takes multiple commits for cleanup.

* CLDR-16433 fix wording

Fix for #2768 (comment)

* CLDR-16456 Fix fileutilities for Windows again (#2767)

* CLDR-16423 v43 include CQ as a sibling to GG (#2775)

* CLDR-16458 fix GenerateDtd and other generators on Windows (#2774)

* CLDR-16122 v43 spec: regenerate ToC (#2770)

* CLDR-16399 en_CA revert short date format to 41 (#2759)

- per TC 2023-02-27

* CLDR-14213 Drop Derby Support: next phase (#2778)

* CLDR-14213 Drop Derby Support: next phase

- remove all infrastructure support for Derby
- does not remove Derby workarounds yet

* CLDR-14213 Drop Derby Support: skip in unit tests

* CLDR-16450 bcp47: Add missing since= attributes, update currency desciptions (#2779)

* CLDR-16467 update CLDR test data (#2776)

* CLDR-16467 Update CLDR test data: Person Names

* CLDR-16467 update coverage (only copyright change)

* CLDR-16467 only change is copyright

* CLDR-16467 Add unit tests. Part of this is a change to the code to avoid having to copy text into files. (More work needs doing.)

* CLDR-16467 Update localeDisplayName.txt test (rewriting)

* CLDR-16470 BRS v43: update readme for beta1 (#2780)

* CLDR-15850 Collect type of vote: direct, auto/manual import, bulk upload (#2777)

* CLDR-15850 Collect type of vote: direct, auto/manual import, bulk upload

-New enum VoteType in its own file VoteType.java

-New vote_type column in db table cldr_vote_value_44 (and later)

-New methods for submitting vote with vote type; default to VoteType.DIRECT

-Remove BallotBox.VOTE_IS_AUTO_IMPORTED, use VoteType.AUTO_IMPORT instead

-For VoteType.MANUAL_IMPORT (anonymous) do not trigger automatic forum posts

* CLDR-16475 ansible updates for ocsp (#2786)

- we can't actually set the ocsp cache due to nginx version, but we can set a resolver

* CLDR-16476 fix problem in localeCanonicalization.txt (#2787)

* CLDR-16477 BRS v43: Update ICU4J libs to 2023-03-15, CheckPersonNamesTest to new API (#2789)

* CLDR-16469 Add inheritEras and remove eras with -2/-1 (#2790)

* CLDR-16468 v43 JSON drop code_fallback and constructed data (#2791)

* CLDR-16468 v43: JSON update logging output

- add some symbols to distinguish sections during build

* CLDR-16468 v43: JSON skip code-fallback/constructed data

- also improve javadocs on CLDRFile and CldrUtility

* CLDR-16468 v43: JSON update logging output

- make it clearer how long we are in the process

* CLDR-15850 Add vote_type column if not present in current table (#2792)

-Use existing method DBUtils.tableHasColumn, and new ALTER TABLE statement

* CLDR-16480 v43 add all missing numsys + test (#2793)

- update root.xml
- add a test
- add a generator
- the test tells you to run the generator

Also, fix an old test that was skipping tests for some numbering systems

* CLDR-16389 v43 update analytics tags (#2795)

* CLDR-16122 v43 remove noise from test run (#2794)

* CLDR-16489 Fix Montreal time zone (#2796)

See #2796

* CLDR-15473 drop section numbering (#2772)

* CLDR-15473 v43 BRS: drop section numbers

* CLDR-15473 v43 BRS: degunkify tr35-personNames.md

* CLDR-15473 v43 BRS: drop superfluous HTML

- For cases where a heading would produce the same result, just use a heading

* CLDR-15473 v43 BRS: drop section numbers

- fix italicized stray commas and spaces per review comments

* CLDR-15473 v43 BRS: drop section numbers

- more fixes per comment

* CLDR-16122 v43 BRS: update © in spec (#2799)

- update fix-tocs so it automatically bumps copyright

* CLDR-16433 Apply fixes from the PNF working group (#2800)

* CLDR-16433 Apply fixes from the PNF working group

* CLDR-16433 Further tweaks

* CLDR-16433 Tweaks2

* CLDR-16433 remaining items

* CLDR-16122 v43 BRS (#2798)

* CLDR-16511 DTD (#2805)

* CLDR-16509 BRS v43: Update ICU4J libs to 73rc, update readme & spec date (#2806)

* CLDR-16437 j:(deps): Bump commons-fileupload from 1.4 to 1.5 in /tools (#2737)

Bumps commons-fileupload from 1.4 to 1.5.

---
updated-dependencies:
- dependency-name: commons-fileupload:commons-fileupload
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-15970 js:(deps-dev): Bump style-loader in /tools/cldr-apps/js (#2151)

Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 2.0.0 to 3.3.1.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/style-loader@v2.0.0...v3.3.1)

---
updated-dependencies:
- dependency-name: style-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-15970 tr:(deps): Bump highlight.js in /tools/scripts/tr-archive (#2587)

Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 11.6.0 to 11.7.0.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md)
- [Commits](highlightjs/highlight.js@11.6.0...11.7.0)

---
updated-dependencies:
- dependency-name: highlight.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-15970 js:(deps): Bump json5 and postcss-modules (#2639)

Bumps [json5](https://github.com/json5/json5) and [postcss-modules](https://github.com/css-modules/postcss-modules). These dependencies needed to be updated together.

Updates `json5` from 2.1.3 to 2.2.3
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.1.3...v2.2.3)

Updates `postcss-modules` from 4.0.0 to 4.3.1
- [Release notes](https://github.com/css-modules/postcss-modules/releases)
- [Changelog](https://github.com/madyankin/postcss-modules/blob/master/CHANGELOG.md)
- [Commits](madyankin/postcss-modules@v4.0.0...v4.3.1)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
- dependency-name: postcss-modules
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 js:(deps-dev): Bump webpack from 5.24.3 to 5.76.0 in /tools/cldr-apps/js (#2781)

* CLDR-16437 js: workaround ERR_OSSL_EVP_UNSUPPORTED

- CLDR-16508
- ref: https://stackoverflow.com/a/69476335/185799
- when we bump webpack to 5.54+ will redo this workaround

* CLDR-16437 js:(deps-dev): Bump webpack in /tools/cldr-apps/js

Bumps [webpack](https://github.com/webpack/webpack) from 5.24.3 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.24.3...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* CLDR-16437 js:(deps-dev): updates for webpack

- update hash function yet again https://stackoverflow.com/a/69394785/185799 CLDR-16508
- update vue-loader (lockfile only)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Steven R. Loomis <srl295@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16122 v43 spec: fix bad link, update wording (#2801)

* CLDR-16437 use mocha-headless-chrome (#2811)

also see CLDR-14408 CLDR-14409

* CLDR-16437 tr:(deps): Bump jsdom in /tools/scripts/tr-archive (#2807)

Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.3 to 21.1.1.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](jsdom/jsdom@20.0.3...21.1.1)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 fix misticketted (#2810)

* CLDR-15850 Add vote type column to Vetting Participation sheet (#2804)

-For now, counts for vote types are shown in the last column

-Change API from dashboard/for, to participation/for

-Omit (unused, large) notifications from Vetting Participation json; new ParticipationResults

* CLDR-16418 Add spec text for parent locales by component (#2744)

See #2744

* CLDR-15861 Add additional spec text around resource inheritance (#2746)

See #2746

* CLDR-9669 Improve some spec info about effect of locale keywords (#2812)

* CLDR-16511 flesh out modification section (#2814)

* CLDR-16511 Flesh out modification section

* CLDR-16511 fix formatting

* CLDR-16517 v43 two cherry-picks to unbreak JS (#2815)

* CLDR-16517 v43 js:(deps-dev): Bump webpack from 5.24.3 to 5.76.0 in /tools/cldr-apps/js (#2781)

cherry pick from CLDR-16437

* CLDR-16437 js: workaround ERR_OSSL_EVP_UNSUPPORTED

- CLDR-16508
- ref: https://stackoverflow.com/a/69476335/185799
- when we bump webpack to 5.54+ will redo this workaround

* CLDR-16437 js:(deps-dev): Bump webpack in /tools/cldr-apps/js

Bumps [webpack](https://github.com/webpack/webpack) from 5.24.3 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.24.3...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* CLDR-16437 js:(deps-dev): updates for webpack

- update hash function yet again https://stackoverflow.com/a/69394785/185799 CLDR-16508
- update vue-loader (lockfile only)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Steven R. Loomis <srl295@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit b7a9c25)

* CLDR-16517 v43 use mocha-headless-chrome (#2811)

cherry pick of CLDR-16437

also see CLDR-14408 CLDR-14409

(cherry picked from commit c572411)

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 js:(deps-dev): Bump @vue/compiler-sfc in /tools/cldr-apps/js (#2755)

Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.0.7 to 3.2.47.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.47/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 tr:(deps): Bump marked in /tools/scripts/tr-archive (#2808)

Bumps [marked](https://github.com/markedjs/marked) from 4.2.5 to 4.3.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](markedjs/marked@v4.2.5...v4.3.0)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16504 Add reference to the recommended open-source alternative for processing phone numbers (#2816)

* CLDR-16511 flesh out modification section 2 (#2818)

* CLDR-16511 flesh out modification section 2

* CLDR-16511 formatting fixes

* CLDR-16511 fixing format 2

* CLDR-16122 v43 BRS: update tocs (#2817)

* CLDR-16511 Refine modification section (#2820)

* CLDR-16511 Refine modification section

* CLDR-16511 Fix typo

* CLDR-16513 v43 BRS: keep anchors stable (#2822)

* CLDR-16513 link target extractor for stability

- add a tool extract-link-targets.js

* CLDR-16513 stable links: check-in maint-42 link anchors

* CLDR-16513 v43 BRS: revert commit that broke many anchors

Revert "CLDR-15473 v43 BRS: drop superfluous HTML"

This reverts commit f8141b9.

* CLDR-16513 stable links:  drop generated markdown anchors

- where they conflict, drop generated markdown anchors by SWAPPING the 'name' attribute from a child element with the parent element's id.
- this keeps redundant link anchors  (parts vs Parts) but causes the autolink (link icon) to always choose the appropriate explicit anchor

* CLDR-16513 v43 BRS: stable links:  update anchors list for  v43

- Show which anchors were added/removed in v43
- this includes a change to not remove the generated ids

* CLDR-16437 js:(deps-dev): Bump vue-loader from 16.1.2 to 16.8.3 in /tools/cldr-apps/js (#2499)

* CLDR-16437 js:(deps-dev): Bump vue-loader in /tools/cldr-apps/js

@srl295 notes
- also bump vue@3.1.x
- also bump ant-design-vue@2.2.x
- also DROP the 'Icon' <a-icon/> import which we were not using
- vue-loader@17.x did not work without vue@3.2 which had other issues.

-----

Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 16.1.2 to 16.8.3
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/next/CHANGELOG.md)
- [Commits](vuejs/vue-loader@v16.1.2...v16.8.3)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* CLDR-16437 js:(deps-dev): Bump vue-loader in /tools/cldr-apps/js

@srl295 notes
- also bump vue@3.1.x
- also bump ant-design-vue@2.2.x
- also DROP the 'Icon' <a-icon/> import which we were not using
- vue-loader@17.x did not work without vue@3.2 which had other issues.

-----

Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 16.1.2 to 16.8.3
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/next/CHANGELOG.md)
- [Commits](vuejs/vue-loader@v16.1.2...v16.8.3)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* CLDR-16437 js:(deps-dev): package-lock.json update

* CLDR-16437 chore: deps, fix webpack

- MainHeader.vue remove an unnecesary $forceUpdate - data is already reactive
- bump to vue@3.2.47
- bump to ant-design-vue@3.2.16
- drop compiler-sfc, now included with vue

other bumps:
-     "vue-loader": "^17.0.1",
-    "webpack": "^5.77.0",
-    "webpack-cli": "^5.0.1"

- reconfigure webpack as production mode only. Will add a switch to bring back dev mode

* CLDR-16437 feat: npm run build-dev

- in "cldr/tools/cldr-apps/js" you can now run "npm run build" which will build with Vue dev-tools installed.
- "npm run watch" still does a watch

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Steven R. Loomis <srl295@gmail.com>

* CLDR-16520 Break lines between cells for diffability (#2819)

* CLDR-16522 deps add .node-version file @ v18.15.0 (#2823)

- add a .node-version file, defacto format defined at https://github.com/shadowspawn/node-version-usage
- mvn/ant code to use the .node-version file within frontend-maven-plugin, workaround for eirslett/frontend-maven-plugin#1047
- use the nodenv/actions/node-version@v3 action which reads .node-version in relevant places
- turn on webpack's persistent cache, and cache it across builds
- also, move some maven plugin dependencies up to tools/pom.xml
I'm keeping package dependencies (such as mysql) in cldr-apps/pom.xml

* CLDR-16048 New forum post window sometimes disappears (#2821)

-Use LRU cache in cldrForumPanel.loadInfo and cldrSideways.loadMenu to avoid disappearance/reload

-New cldrCache.mjs for simple front-end LRU cache, with unit test TestCldrCache.mjs

-New Refresh button in Info Panel, clears caches and reloads

-Clear forum cache when user submits a post

-Remove cldrForumPanel.appendForumStuff, merge into loadInfo instead

-Encapsulate FORUM_DIV_CLASS (forumDiv) and SIDEWAYS_AREA_CLASS (sidewaysArea)

-Refactor/modernize some related code; reduce cruft; new subroutines to shorten long methods

-Remove dead code (buttonTitle, theForum, replyStub, postUrl, tr.forumDiv.forumPosts, ...)

-Update pretty.sh to recognize .mjs everywhere it recognizes .js

-Comments

* CLDR-14276 update ckb single character + add locale tags (#2412)

See #2412

* CLDR-16122 v43 BRS: ISO-4217 amd 175, SLL -> 2023-12-31 (#2825)

- Per https://www.six-group.com/dam/download/banking-services/interbank-clearing/en/news/public-notice-redenomination-leone.pdf
- SLL is legal tender through 2023-12-31
- per Bank of Sierra Leone note 2023-03-10

See CLDR-15900 for prior amds.

* CLDR-16531 v44 BRS: ISO-4217 amd 175, SLL -> 2023-12-31 (#2825) (#2827)

- cherrypick from #2825 CLDR-16122
- Per https://www.six-group.com/dam/download/banking-services/interbank-clearing/en/news/public-notice-redenomination-leone.pdf
- SLL is legal tender through 2023-12-31
- per Bank of Sierra Leone note 2023-03-10

See CLDR-15900 for prior amds.

(cherry picked from commit 4222a03)

* CLDR-16414 Revision of inheritance (v44) (#2826)

-Restore front-end distinction between hard/soft inheritance, dropped in pr 2433

-Fix typo in unrelated recent pr 2821

* CLDR-16316 test: make it a warning if a currency code recently expired (#2828)

* CLDR-16532 Ignore missing hidden notifications table if db is too old (#2834)

-Avoid throwing exception with db before version 42, for testing other features than hidden notifications

-Earlier versions had versioned tables like cldr_dash_hide_41 or cldr_review_hide_38

* CLDR-15946 make fancy quotes secondary-different from each other (#2833)

* CLDR-16512 v43 BRS spec links phase 1 (#2837)

* CLDR-16449 Retain sr_Latn (#2838)

* CLDR-16131 fix glych in empty value (#2836)

* CLDR-16512 v43 BRS: fix internal spec links (#2842)

* CLDR-16549 BRS v43: Update ICU4J libs to 2023-04-06 with coll fix; update readme & spec dates (#2844)

* CLDR-15850 Refactor cldrVettingParticipation.js before further changes (#2843)

-To facilitate inserting new rows without adding new bugs, avoid hard-coded column numbers/letters

-New const array: COLUMNS, single data item determines the ordering/labeling of columns

-New const strings: COLUMN_TITLE_ORG, COLUMN_TITLE_LOCALE_NAME, ...

-Reduce function length by using new subroutines: getHeaderRow, getIndexOfColumnsByTitle, getDefaultRow, addColumnComments

-TODO comments for revising the wording of some column comments

* CLDR-16550 BRS 43 beta5, CLDRModify passes: -fQ reorders annotations (#2845)

with quotes; -fP reorders geresh/gershayim in punctuation exemplars

* CLDR-16532 Follow-up: define constant FIRST_DB_VERSION for magic number 42 (#2835)

* CLDR-14527 Fix broken links to spec (#2839)

* CLDR-15850 Replace single Vote Type column with five specific columns (#2846)

-New const COLUMN_TITLE_VOTES_DIRECT, ...; new const VOTE_TYPES; new method getVoteTypes

-Revise COLUMNS

-Revise the wording of some column comments

-Include column title with comment, for convenience if column is narrower than title

-Warn in console if more than 26 columns A-Z

-Change some console.log to console.warn

* CLDR-15850 Vetting table xlsx use encode_cell (#2847)

-Support more than 26 columns using pre-existing library method

* CLDR-16554 Update date/status in readmes; remove -SNAPSHOT in pom.xml versions (#2848)

* CLDR-16555 BRS 43 pre-final CLDRModify: remove blank header lines, update copyrights (#2850)

* CLDR-16538 B Revise the likely subtags chart (#2851)

* CLDR-16538 B revise the likely subtags chart

* CLDR-16538 restore doing all charts

* CLDR-16538 Fix anchors

* CLDR-16122 v43 BRS finalize the spec (#2852)

- drop “draft” and update status
- also fix keyboard links to go to the new subcommittee homepage

* CLDR-16466 move unicode-license.txt to LICENSE (#2849)

- this is the standard name for this file, gets prominent display on github.com etc.
- fixup some issues with the LICENSE file's inclusion in the cldr-code jar

* CLDR-16464 v44: bump version numbers to v44 (#2853)

* CLDR-16464 v44: bump version numbers to v44

* CLDR-16464 v44: logKnownIssue on a test

- as far as i can tell this would be fixed by merge from the maint branch?

* CLDR-16560 Requirements for storing inheritance marker (#2855)

-When needed to meet requirements, change INHERITANCE_MARKER to Bailey or vice-versa

-New method STFactory.DataBackedSource.reviseInheritanceAsNeeded called by setValueFromResolver

-Throw exception from reviseInheritanceAsNeeded if CLDRFile has isResolved false

-Only change STFactory; no changes to CLDRFile

* CLDR-16560 Requirements for storing inheritance marker, revert last PR (#2856)

-Revert pending redesign

* CLDR-16122 v43: remove 'Proposed Update' tr35.md (#2858)

- missed in earlier commit

* CLDR-16570 retire old cookies, use a jwt for keep-logged-in (#2857)

- does not replace or modify the X-SurveyTool-Session
- JWT payload is just the subject with the user's id
- secret key is managed automatically

* CLDR-16564 fix metadata for misticketted (#2859)

- f0324b8 (#2853)
was supposed to be CLDR-16564

* CLDR-16564 v44 SBRS: update tests to -z BUILD (#2864)

* CLDR-16390 Tooling and functions for Inheritance Explaining (#2860)

* CLDR-16390 Tooling and functions for Inheritance Explaining

- new tool PathInfo
- Option.getHelp() now public and useful
- new class LocaleInheritanceInfo to track inheritance traces
- added documentation to With for using forEach
- updated XMLSource.getPathLocation mechanism to track LocaleInheritanceInfo details
- added code to CLDRFile.getName to track glossonymn construction

* CLDR-16390 use a single CODE_FALLBACK_ID constant

* CLDR-16390 Inheritance Explainer

- remove incorrect comment in CLDRFile
- fix documentation around using --infile=-

* CLDR-16390 Inheritance Explainer

- add additional reasons
- unit test, partly against 'testdata' so we don't depend on real data
- update the 'testdata' common tree, with a new DTD
- cleanups per code review

* CLDR-16578 SBRS v44 update ICU4J libs in CLDR to ICU 73 final release (#2867)

* CLDR-16123 add spotless (#2803)

* CLDR-16123 spotless: docs, pom, action

- add a job to check the spotless build
- add a tools/README.md with help on using spotless
- update README.md with a link to tools/README.md
- update pom.xml to apply spotless

* CLDR-16123 spotless: apply changes

* CLDR-16437 js:(deps-dev): Bump style-loader in /tools/cldr-apps/js (#2831)

Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/style-loader@v3.3.1...v3.3.2)

---
updated-dependencies:
- dependency-name: style-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 j:(deps): Bump maven-resources-plugin in /tools (#2824)

Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.0.2 to 3.3.1.
- [Release notes](https://github.com/apache/maven-resources-plugin/releases)
- [Commits](apache/maven-resources-plugin@maven-resources-plugin-3.0.2...maven-resources-plugin-3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-resources-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 j:(deps): Bump maven-war-plugin from 3.2.3 to 3.3.2 in /tools (#2829)

Bumps [maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.2.3 to 3.3.2.
- [Release notes](https://github.com/apache/maven-war-plugin/releases)
- [Commits](apache/maven-war-plugin@maven-war-plugin-3.2.3...maven-war-plugin-3.3.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-war-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16437 js:(deps-dev): Bump css-loader in /tools/cldr-apps/js (#2830)

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 5.1.1 to 6.7.3.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v5.1.1...v6.7.3)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16564 turn off LIMITED_SUBMISSION for v44 (#2870)

* - toc rebuild

* CLDR-16437 tr:(deps): Bump anchor-js in /tools/scripts/tr-archive (#2682)

Bumps [anchor-js](https://github.com/bryanbraun/anchorjs) from 4.3.1 to 5.0.0.
- [Release notes](https://github.com/bryanbraun/anchorjs/releases)
- [Commits](bryanbraun/anchorjs@4.3.1...5.0.0)

---
updated-dependencies:
- dependency-name: anchor-js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CLDR-16466 updates to CONTRIBUTING.md and README.md (#2873)

- per licensing and new CLA

* CLDR-16390 UI for Inheritance Explainer (#2871)

* CLDR-16577 fix typo in markdown (#2869)

- leftover merge conflict marker

* CLDR-16590 Fix Coverage Menu Woes, also Inheritance (#2878)

* fix bad merge

* CLDR-15034 kbd: fix random gratuitous merge conflicts

* CLDR-15034 kbd: fix test file name, dup test

- test data appears as duplicate xpaths. Not really an issue, but defer for now
- fix a locale id issue

* CLDR-15034 kbd: spotless

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Tom Bishop <thomasbishop@wenlin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Davis <mark@macchiato.com>
Co-authored-by: Robin Leroy <egg.robin.leroy@gmail.com>
Co-authored-by: Peter Edberg <42151464+pedberg-icu@users.noreply.github.com>
Co-authored-by: Shane F. Carr <shane@unicode.org>
Co-authored-by: Robert Bastian <robertbastian@users.noreply.github.com>
Co-authored-by: Layik Hama <layik.hama@gmail.com>
Co-authored-by: Markus Scherer <markus.icu@gmail.com>
Co-authored-by: Peter Edberg <pedberg@unicode.org>
  • Loading branch information
11 people authored Apr 28, 2023
1 parent b3da9e8 commit 5819cc2
Show file tree
Hide file tree
Showing 994 changed files with 115,055 additions and 76,815 deletions.
2 changes: 2 additions & 0 deletions .github/COMMIT_METADATA.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
- 9e15f63e30cadf57b8eee0f6d6c3398263dfcdac CLDR-15470 v41 cherry pick
- 7b370d06c506200e31f9053416ce98cf23d1d1b6 CLDR-16058 v42 cherry pick into v43
- 5056ea26b4bcbee90652b487a88d79b7f506f432 CLDR-16098 v43 cherry pick
- 7c8c8bb83ca253f499d4d5c08f968327611a6a70 CLDR-16437 v44 dep fix
- f0324b82d27695306d1126c54a6de381cfbd9bcc CLDR-16564 v44 version number fix

### The following are items to skip for a certain CLDR version.
### Format: `# SKIP v00` followed by a list of commits to skip for that version (same structure as above)
Expand Down
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-15970 gh:"
prefix: "CLDR-16437 gh:"
assignees:
- btangmu
- srl295
Expand All @@ -25,7 +25,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-15970 js:"
prefix: "CLDR-16437 js:"
assignees:
- btangmu
- srl295
Expand All @@ -39,7 +39,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-15970 tr:"
prefix: "CLDR-16437 tr:"
assignees:
- btangmu
- srl295
Expand All @@ -54,7 +54,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-15970 j:"
prefix: "CLDR-16437 j:"
assignees:
- btangmu
- srl295
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ jobs:
distribution: 'temurin'
- name: Cache local Maven repository
if: matrix.language == 'java'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('tools/**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Cache local npm repository
if: matrix.language == 'javascript'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ jobs:
restore-keys: |
${{ runner.os }}-nodetr-
nodetr-
- uses: actions/setup-node@v3
with:
node-version: '16'
- uses: nodenv/actions/node-version@v3 # setup using .node-version
- name: Run TR archiver
# Note: will update ToC if out of date
run: 'cd tools/scripts/tr-archive/ && npm ci && npm run build'
- name: 'Run TR link extractor (experimental)'
# Note: see CLDR-16526 for making this an error
run: 'cd tools/scripts/tr-archive/ && npm run extract-link-targets || (echo Warning, please fix these ; true)'
- name: Lint Markdown
# Warn, don't fail yet
run: npx markdownlint-cli *.md {specs,docs}/*.md $(find .github -name '*.md') || (echo Warning, please fix these ; true)
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ name: JavaScript Tests
on:
push:
paths:
- '.node-version'
- 'tools/cldr-apps/js/**'
- '.github/workflows/js.yml'
pull_request:
paths:
- '.node-version'
- 'tools/cldr-apps/js/**'
- '.github/workflows/js.yml'

Expand All @@ -17,6 +19,15 @@ jobs:
- uses: actions/checkout@v3
with:
lfs: false # not needed for this job, as we don’t currently do a Java build
- uses: nodenv/actions/node-version@v3 # setup using .node-version
- name: Cache webpack
uses: actions/cache@v3
with:
path: tools/cldr-apps/target/webpack_cache
key: ${{ runner.os }}-webpack-${{ hashFiles('tools/cldr-apps/package*') }}-${{ hashFiles('tools/cldr-apps/src/**') }}
restore-keys: |
${{ runner.os }}-webpack-
webpack-
- name: Cache npm repository
uses: actions/cache@v3
with:
Expand All @@ -31,5 +42,5 @@ jobs:
# stopgap: fail this if it takes too long
timeout-minutes: 10
run: (cd tools/cldr-apps/js && npm t)
- name: Run Webpack build
- name: Run Webpack production build
run: (cd tools/cldr-apps/js && npm run build)
38 changes: 37 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,34 @@ on:
required: false

jobs:
formatter:
name: Formatter + Style checker
runs-on: ubuntu-latest
steps:
# since we have to checkout all branches, cache here
- name: Cache .git
uses: actions/cache@v3
with:
path: .git
key: git-${{ github.base_ref }}-${{ github.head_ref }}
restore-keys: |
git-${{ github.base_ref }}-${{ github.head_ref }}
git-${{ github.base_ref }}
git-
- name: Checkout CLDR
uses: actions/checkout@v3
with:
lfs: false
fetch-depth: 0 # fetch all branches so that Spotless can resolve `origin/main`
- name: Cache local Maven repository
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('tools/**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Check Java style
run: mvn --file=tools/pom.xml spotless:check || (echo "Style checker failed. Formatting changes can be applied by 'mvn spotless:apply'" && exit 1)
build:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -46,6 +74,14 @@ jobs:
restore-keys: |
${{ runner.os }}-node-
node-
- name: Cache webpack
uses: actions/cache@v3
with:
path: tools/cldr-apps/target/webpack_cache
key: ${{ runner.os }}-webpack-${{ hashFiles('tools/cldr-apps/package*') }}-${{ hashFiles('tools/cldr-apps/src/**') }}
restore-keys: |
${{ runner.os }}-webpack-
webpack-
- name: Lint GitHub Actions
run: npx yaml-lint .github/workflows/*.yml
- name: Build with Maven
Expand Down Expand Up @@ -124,7 +160,7 @@ jobs:
name: cldr-code
path: tools/cldr-code/target/
- name: run CLDR console check
run: java -DCLDR_GITHUB_ANNOTATIONS=true -DCLDR_DIR=$(pwd) -Xmx6g -jar tools/cldr-code/target/cldr-code.jar check -S common,seed -e -z FINAL_TESTING
run: java -DCLDR_GITHUB_ANNOTATIONS=true -DCLDR_DIR=$(pwd) -Xmx6g -jar tools/cldr-code/target/cldr-code.jar check -S common,seed -e -z BUILD
deploy:
# don't run deploy on manual builds!
if: github.repository == 'unicode-org/cldr' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.event.inputs.git-ref == ''
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ exception.log
# Site generation stuff
/_site
derby.log
.lycheecache
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18.15.0
21 changes: 14 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The CLDR project consists of 3 aspects:
For all PRs these steps are required before the PR is merged:

- The PR and commits must reference a [Jira][] ticket which has been accepted by the CLDR-TC. Open a ticket if there is not already a relevant one open.
- The CLA must be signed, agreeing to the [Terms of use][]. You will be prompted on the PR to sign this if you have not already done so.
- A Contributor License Agreement (CLA) must be signed. For more information, see [Contributor License Agreement](#contributor-license-agreement), below.
- All tests must pass (See below)
- The PR must be reviewed by a TC member.
- The PR should have a single commit, and the first line of the commit must
Expand All @@ -48,13 +48,16 @@ begin with the accepted Jira ticket number.
- Here is an item
- Here is another item

### Licenses
## Contributor License Agreement

In order to contribute to this project, the Unicode Consortium must have on file a Contributor License Agreement (CLA) covering your contributions, either an individual or a corporate CLA. Pull Requests will not be merged until the correct CLA is signed. Which version needs to be signed depends on who owns the contribution being made: you as the individual making the contribution or your employer. _It is your responsibility to determine whether your contribution is owned by your employer._ Please review [The Unicode Consortium Intellectual Property, Licensing, and Technical Contribution Policies][policies] for further guidance on which CLA to sign, as well as other information and guidelines regarding the Consortium’s licensing and technical contribution policies and procedures.

- **Individual CLA**: If you have determined that the Individual CLA is appropriate, just open a Pull Request and you will have the opportunity to click to accept the Individual CLA.

- **Corporate CLA**: If you have determined that a Corporate CLA is appropriate, please check the [public list of Corporate CLAs][unicode-corporate-clas] that the Consortium has on file. If your employer has already signed a CLA, then just open a Pull Request and you will have the opportunity to click that your employer has already signed a CLA. If your employer has not already signed a CLA, you will need to arrange for your employer to sign the Corporate CLA, as described in [How to Sign a Unicode CLA][signing].

Unless otherwise noted in the LICENSE file, this project is released under the free and open-source [Unicode License][unicode-license], also known as Unicode, Inc. License Agreement - Data Files and Software.

- Usage of CLDR data and software is governed by the Unicode [Terms of use][] a copy of which is included as [unicode-license.txt][]
- Some CLDR tools depend on libraries in tools/cldr-code/libs/; use of these libraries is governed by separate license agreements.
- For example, use of the Guava, Xerces, and Myanmar Tools libraries is subject to the Apache License included as [apache-license.txt](./apache-license.txt)
- Use of the ICU libraries is subject to the ICU License, included as [ICU-LICENSE](./ICU-LICENSE).
- There must be a signed CLA before code is contributed, the PR will not be merged until the CLA is signed.

## Building

Expand Down Expand Up @@ -103,3 +106,7 @@ All rights reserved. [Terms of use][]
[supplemental data]: https://github.com/unicode-org/cldr/tree/main/common/supplemental
[About Status Checks]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-status-checks
[Running Tests]: https://cldr.unicode.org/development/cldr-development-site/running-tests
[policies]: https://www.unicode.org/policies/licensing_policy.html
[unicode-corporate-clas]: https://www.unicode.org/policies/corporate-cla-list/
[signing]: https://www.unicode.org/policies/licensing_policy.html#signing
[unicode-license]: ./LICENSE
File renamed without changes.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Unicode CLDR Project

Latest Release: [v42.0](https://cldr.unicode.org/index/downloads/cldr-42) published 2022-10-19
Latest Release: [v42.0](https://cldr.unicode.org/index/downloads/cldr-43) published 2023-04-12

## Build Status

Expand Down Expand Up @@ -28,13 +28,13 @@ Click [HERE](https://www.unicode.org/cldr/survey_tool.html) for information on h

For details about code and other contributions, see [CONTRIBUTING.md](./CONTRIBUTING.md)

### Licenses
#### Spotless

A source formatter is now used, please see [spotless](./tools/README.md#spotless) for details.

- Usage of CLDR data and software is governed by the [Unicode Terms of Use](https://www.unicode.org/copyright.html)
a copy of which is included as [unicode-license.txt](./unicode-license.txt).
### Licenses

- Some CLDR tools depend on library dependencies managed via Maven,
use of these libraries is governed by separate license agreements.
This project is released under the free and open-source [Unicode License](./LICENSE), also known as _Unicode, Inc. License Agreement - Data Files and Software_. Note that some CLDR tools depend on libraries managed via Maven; use of these libraries is governed by separate license agreements.

SPDX-License-Identifier: Unicode-DFS-2016

Expand Down
20 changes: 10 additions & 10 deletions common/annotations/gu.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
<!-- Copyright © 1991-2022 Unicode, Inc.
<!-- Copyright © 1991-2023 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
Expand Down Expand Up @@ -3249,27 +3249,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<annotation cp="🈁" type="tts">ચોરસમાં અહીં માટેનું જાપાની ચિહ્ન</annotation>
<annotation cp="🈂">“સેવા શુલ્ક” | કટકાના | ચોરસમાં &quot;સેવા શુલ્ક&quot; હેતુ જાપાની ચિહ્ન | જાપાનીઝ | サ</annotation>
<annotation cp="🈂" type="tts">ચોરસમાં &quot;સેવા શુલ્ક&quot; હેતુ જાપાની ચિહ્ન</annotation>
<annotation cp="🈷">&quot;માસિક રકમ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “માસિક રકમ” | જાપાનીઝ | ભાવચિત્ર | 月</annotation>
<annotation cp="🈷">“માસિક રકમ” | &quot;માસિક રકમ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 月</annotation>
<annotation cp="🈷" type="tts">&quot;માસિક રકમ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="🈶">&quot;નિઃશુલ્ક નથી&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “નિઃશુલ્ક નથી” | જાપાનીઝ | ભાવચિત્ર | 有</annotation>
<annotation cp="🈶">“નિઃશુલ્ક નથી” | &quot;નિઃશુલ્ક નથી&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 有</annotation>
<annotation cp="🈶" type="tts">&quot;નિઃશુલ્ક નથી&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="🈯">&quot;અનામત&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “અનામત” | જાપાનીઝ | ભાવચિત્ર | 指</annotation>
<annotation cp="🈯">“અનામત” | &quot;અનામત&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 指</annotation>
<annotation cp="🈯" type="tts">&quot;અનામત&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="🉐">&quot;સોદો&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ગોળ બટન | “સોદો” | જાપાનીઝ | ભાવચિત્ર | 得</annotation>
<annotation cp="🉐">“સોદો” | &quot;સોદો&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ગોળ બટન | જાપાનીઝ | ભાવચિત્ર | 得</annotation>
<annotation cp="🉐" type="tts">&quot;સોદો&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ગોળ બટન</annotation>
<annotation cp="🈹">&quot;છૂટ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “છૂટ” | જાપાનીઝ | ભાવચિત્ર | 割</annotation>
<annotation cp="🈹">“છૂટ” | &quot;છૂટ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 割</annotation>
<annotation cp="🈹" type="tts">&quot;છૂટ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="🈚">ચોરસમાં નિઃશુલ્ક માટે જાપાનીઝ શબ્દ | જાપાની &quot;નિઃશુલ્ક&quot; બટન | જાપાનીઝ &quot;નિઃશુલ્ક&quot; બટન | જાપાનીઝ શબ્દ</annotation>
<annotation cp="🈚" type="tts">જાપાની &quot;નિઃશુલ્ક&quot; બટન</annotation>
<annotation cp="🈲">ચોરસમાં નિષિદ્ધ માટે જાપાની શબ્દ | ચોરસમાં નિષેધ માટે જાપાની શબ્દ | જાપાની &quot;નિષેધ&quot; બટન | જાપાની શબ્દ</annotation>
<annotation cp="🈲" type="tts">જાપાની &quot;નિષેધ&quot; બટન</annotation>
<annotation cp="🉑">&quot;સ્વીકૃતિ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ગોળ બટન | “સ્વીકૃતિ” | જાપાનીઝ | ભાવચિત્ર | 可</annotation>
<annotation cp="🉑">“સ્વીકૃતિ” | &quot;સ્વીકૃતિ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ગોળ બટન | જાપાનીઝ | ભાવચિત્ર | 可</annotation>
<annotation cp="🉑" type="tts">&quot;સ્વીકૃતિ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ગોળ બટન</annotation>
<annotation cp="🈸">&quot;લાગુ કરો&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “લાગુ કરો” | જાપાનીઝ | ભાવચિત્ર | 申</annotation>
<annotation cp="🈸">“લાગુ કરો” | &quot;લાગુ કરો&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 申</annotation>
<annotation cp="🈸" type="tts">&quot;લાગુ કરો&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="🈴">&quot;પાસિંગ ગ્રેડ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “પાસિંગ ગ્રેડ” | જાપાનીઝ | ભાવચિત્ર | 合</annotation>
<annotation cp="🈴">“પાસિંગ ગ્રેડ” | &quot;પાસિંગ ગ્રેડ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 合</annotation>
<annotation cp="🈴" type="tts">&quot;પાસિંગ ગ્રેડ&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="🈳">&quot;ખાલી જગ્યા&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | “ખાલી જગ્યા” | જાપાનીઝ | ભાવચિત્ર | 空</annotation>
<annotation cp="🈳">“ખાલી જગ્યા” | &quot;ખાલી જગ્યા&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન | જાપાનીઝ | ભાવચિત્ર | 空</annotation>
<annotation cp="🈳" type="tts">&quot;ખાલી જગ્યા&quot; માટેના જાપાનીઝ શબ્દ સાથેનું ચોરસ બટન</annotation>
<annotation cp="">“અભિનંદન” | ગોળમાં અભિનંદન આપતો આઇડિયોગ્રાફ | જાપાનીઝ | જાપાનીઝ “અભિનંદન” શબ્દ સાથેનું ગોળ બટન | ભાવચિત્ર | 祝</annotation>
<annotation cp="" type="tts">ગોળમાં અભિનંદન આપતો આઇડિયોગ્રાફ</annotation>
Expand Down
Loading

0 comments on commit 5819cc2

Please sign in to comment.