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-16998 Fix Formatting #3581

Merged
merged 2 commits into from
Mar 28, 2024
Merged

CLDR-16998 Fix Formatting #3581

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e55ab15
CLDR-16998 Fix Formatting
macchiati Mar 28, 2024
59e1230
CLDR-16998 Fixed typos
macchiati Mar 28, 2024
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
25 changes: 12 additions & 13 deletions docs/ldml/tr35.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,9 +1661,9 @@ __Lateral Inheritance__ is where resources are inherited from within the same lo

| Element @Attribute | Source | Context |
| ---------------- | ------ | ------- |
| currency @pattern | currencyFormat | numberSystem = defaultNumberingSystem, unless otherwise specified*<br/>currencyFormatLength type=none, unless otherwise specified<br/>currencyFormat type="standard", unless otherwise specified |
| currency @decimal | symbols @decimal | numberSystem = defaultNumberingSystem, unless otherwise specified |
| currency @group | symbols @group | numberSystem = defaultNumberingSystem, unless otherwise specified |
| `currency` `@pattern` | `currencyFormat` | `numberSystem` = `defaultNumberingSystem`, unless otherwise specified*<br/>`currencyFormatLength` type=none, unless otherwise specified<br/>`currencyFormat` `type="standard"`, unless otherwise specified |
| `currency` `@decimal` | `symbols` `@decimal` | `numberSystem` = `defaultNumberingSystem`, unless otherwise specified |
| `currency` `@group` | `symbols` `@group` | `numberSystem` = `defaultNumberingSystem`, unless otherwise specified |

>\* The "unless otherwise specified" clause is for when an API or other context indicates a different choice, such as currencyFormat type="accounting".

Expand All @@ -1673,11 +1673,11 @@ The following attributes use lateral inheritance for **all elements** with the D

| Attribute | Fallback | Exception Elements |
| ---------- | -------------------------------------- | --------------------------- |
| alt | __no alt attribute__ | _none_ |
| case | "nominative" → ∅ | caseMinimalPairs |
| gender | default_gender(locale) → ∅ | genderMinimalPairs |
| count | plural_rules(locale, x) → "other" → ∅ | minDays, pluralMinimalPairs |
| ordinal | plural_rules(locale, x) → "other" → ∅ | ordinalMinimalPairs |
| `alt` | __no alt attribute__ | _none_ |
| `case` | "nominative" → ∅ | `caseMinimalPairs` |
| `gender` | default_gender(locale) → ∅ | `genderMinimalPairs` |
| `count` | plural_rules(locale, x) → "other" → ∅ | `minDays`, `pluralMinimalPairs` |
| `ordinal` | plural_rules(locale, x) → "other" → ∅ | `ordinalMinimalPairs` |

The gender fallback is to neuter if the locale has a neuter gender, otherwise masculine. This may be extended in the future if necessary. See also [Part 2, Grammatical Features](tr35-general.md#Grammatical_Features).

Expand Down Expand Up @@ -3803,13 +3803,12 @@ A matching rule can be used to transform the source fields as follows

_Example:_

> source=ja-Latn-fonipa-hepburn-heploc
> source="ja-Latn-fonipa-hepburn-heploc"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought he was also asking for formatting around this line?

>
> rule ="\<languageAlias type="und-hepburn-heploc"
> rule =`\<languageAlias type="und-hepburn-heploc" replacement="und-alalc97">`
>
> replacement="und-alalc97">"
>
> result="ja-Latn-alalc97-fonipa" // note that CLDR canonical order of variants is alphabetical
> result="ja-Latn-alalc97-fonipa"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought source and result were also supposed to be enclosed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just changed the items that are fragments of XML syntax; that is more consistent with the rest of the document. Adding a note to the ticket.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and around this line?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left the strings alone, and just changed the XML fragments (for more consistency with the rest of the document)

BTW, we definitely could use a scrub to fix the formatting overall, but that's a big-ticket item!

> (note that CLDR canonical order of variants is alphabetical)

##### Territory Exception

Expand Down
Loading