NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit51e225d

committed

Expand set of predefined ICU locales

Install language+region combinations even if they are not distinct fromthe language's base locale. This gives better long-term stability ofthe set of predefined locales and makes the predefined locales lessimplementation-dependent and more practical for users.Reviewed-by: Peter Geoghegan <pg@bowt.ie>

1 parent1f6d515 commit51e225dCopy full SHA for 51e225d

File tree

2 files changed

+18

-10

lines changed

doc/src/sgml
- charset.sgml
src/backend/commands
- collationcmds.c

2 files changed

+18

-10

lines changed

`‎doc/src/sgml/charset.sgml`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -653,9 +653,8 @@ SELECT a COLLATE "C" < b COLLATE "POSIX" FROM test1;`
`653`	`653`	`string will be accepted as a locale name.)`
`654`	`654`	`See <ulink url="http://userguide.icu-project.org/locale"></ulink> for`
`655`	`655`	`information on ICU locale naming. <command>initdb</command> uses the ICU`
`656`		`- APIs to extract a set of locales with distinct collation rules to populate`
`657`		`- the initial set of collations. Here are some example collations that`
`658`		`- might be created:`
	`656`	`+ APIs to extract a set of distinct locales to populate the initial set of`
	`657`	`+ collations. Here are some example collations that might be created:`
`659`	`658`
`660`	`659`	`<variablelist>`
`661`	`660`	`<varlistentry>`
`@@ -677,9 +676,9 @@ SELECT a COLLATE "C" < b COLLATE "POSIX" FROM test1;`
`677`	`676`	`<listitem>`
`678`	`677`	`<para>German collation for Austria, default variant</para>`
`679`	`678`	`<para>`
`680`		`- (As of this writing, there is no,`
`681`		`-say, <literal>de-DE-x-icu</literal>or <literal>de-CH-x-icu</literal>,`
`682`		`-because those areequivalent to <literal>de-x-icu</literal>.)`
	`679`	`+ (There are also, say, <literal>de-DE-x-icu</literal>`
	`680`	`+ or <literal>de-CH-x-icu</literal>, but as of this writing, they are`
	`681`	`+ equivalent to <literal>de-x-icu</literal>.)`
`683`	`682`	`</para>`
`684`	`683`	`</listitem>`
`685`	`684`	`</varlistentry>`
`@@ -690,6 +689,7 @@ SELECT a COLLATE "C" < b COLLATE "POSIX" FROM test1;`
`690`	`689`	`<para>German collation for Austria, phone book variant</para>`
`691`	`690`	`</listitem>`
`692`	`691`	`</varlistentry>`
	`692`	`+`
`693`	`693`	`<varlistentry>`
`694`	`694`	`<term><literal>und-x-icu</literal> (for <quote>undefined</quote>)</term>`
`695`	`695`	`<listitem>`
`@@ -724,7 +724,6 @@ SELECT a COLLATE "C" < b COLLATE "POSIX" FROM test1;`
`724`	`724`	`<programlisting>`
`725`	`725`	`CREATE COLLATION german FROM "de_DE";`
`726`	`726`	`CREATE COLLATION french FROM "fr-x-icu";`
`727`		`-CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";`
`728`	`727`	`</programlisting>`
`729`	`728`	`</para>`
`730`	`729`

`‎src/backend/commands/collationcmds.c`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,16 @@ pg_import_system_collations(PG_FUNCTION_ARGS)`
`667`	`667`	`}`
`668`	`668`	`#endif/* READ_LOCALE_A_OUTPUT */`
`669`	`669`
`670`		`-/* Load collations known to ICU */`
	`670`	`+/*`
	`671`	`+ * Load collations known to ICU`
	`672`	`+ *`
	`673`	`+ * We use uloc_countAvailable()/uloc_getAvailable() rather than`
	`674`	`+ * ucol_countAvailable()/ucol_getAvailable(). The former returns a full`
	`675`	`+ * set of language+region combinations, whereas the latter only returns`
	`676`	`+ * language+region combinations of they are distinct from the language's`
	`677`	`+ * base collation. So there might not be a de-DE or en-GB, which would be`
	`678`	`+ * confusing.`
	`679`	`+ */`
`671`	`680`	`#ifdefUSE_ICU`
`672`	`681`	`{`
`673`	`682`	`inti;`
`@@ -676,7 +685,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)`
`676`	`685`	`* Start the loop at -1 to sneak in the root locale without too much`
`677`	`686`	`* code duplication.`
`678`	`687`	`*/`
`679`		`-for (i=-1;i<ucol_countAvailable();i++)`
	`688`	`+for (i=-1;i<uloc_countAvailable();i++)`
`680`	`689`	`{`
`681`	`690`	`/*`
`682`	`691`	`* In ICU 4.2, ucol_getKeywordValuesForLocale() sometimes returns`
`@@ -706,7 +715,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)`
`706`	`715`	`if (i==-1)`
`707`	`716`	`name="";/* ICU root locale */`
`708`	`717`	`else`
`709`		`-name=ucol_getAvailable(i);`
	`718`	`+name=uloc_getAvailable(i);`
`710`	`719`
`711`	`720`	`langtag=get_icu_language_tag(name);`
`712`	`721`	`collcollate=U_ICU_VERSION_MAJOR_NUM >=54 ?langtag :name;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit51e225d

File tree

2 files changed

2 files changed

`‎doc/src/sgml/charset.sgml`

`‎src/backend/commands/collationcmds.c`

0 commit comments