From 1d479c8c33bab8c47f66c2199a353b5459881be3 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 23 Oct 2017 19:19:21 +0200 Subject: Fixes for tpi_PG locale * localedata/locales/tpi_PG (LC_MESSAGES): Fix yesexpr and noexpr by adding the generic +1 and -0 as in all other locales. * localedata/locales/tpi_PG (LC_TIME): Fix some typos in the month and day names and make it more readable by using ASCII where possible. --- ChangeLog | 7 ++ localedata/locales/tpi_PG | 160 ++++++++++++++++++++-------------------------- 2 files changed, 75 insertions(+), 92 deletions(-) diff --git a/ChangeLog b/ChangeLog index 265524f10a..e03992fe22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-10-23 Mike FABIAN + + * localedata/locales/tpi_PG (LC_MESSAGES): Fix yesexpr and noexpr + by adding the generic +1 and -0 as in all other locales. + * localedata/locales/tpi_PG (LC_TIME): Fix some typos in the month and + day names and make it more readable by using ASCII where possible. + 2017-10-24 Joseph Myers * sysdeps/x86/fpu/fix-fp-int-compare-invalid.h diff --git a/localedata/locales/tpi_PG b/localedata/locales/tpi_PG index 4f604dd196..086268135b 100644 --- a/localedata/locales/tpi_PG +++ b/localedata/locales/tpi_PG @@ -49,84 +49,76 @@ LC_TIME % Full month names % Month names from http://www.tok-pisin.com, the month names from % http://wikitravel.org/en/Tok_Pisin_phrasebook differ a bit. -% Janueri, Februeri, Mas, Epril, Me, Jun, Julai, Ogas, Septemba, Oktoba, Novemba, Desemba -mon "";/ - "" - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% +mon "Janueri";/ + "Februeri" + "Mas";/ + "Epril";/ + "Me";/ + "Jun";/ + "Julai";/ + "Ogas";/ + "Septemba";/ + "Oktoba";/ + "Novemba";/ + "Desemba" % Abbreviated month names -% Jan, Feb, Mar, Epr, Me, Jun, Jul, Oga, Sep, Okt, Nov, Des -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% +abmon "Jan";/ + "Feb";/ + "Mas";/ + "Epr";/ + "Me";/ + "Jun";/ + "Jul";/ + "Oga";/ + "Sep";/ + "Okt";/ + "Nov";/ + "Des" % Full Weekday names -% Sande, Mande, Tunde, Trinde, Fonde, Fraide, Sarere -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +day "Sande";/ + "Mande";/ + "Tunde";/ + "Trinde";/ + "Fonde";/ + "Fraide";/ + "Sarere" % % Abbreviated Weekday names -% San, Man, Tun, Tri, Fon, Fra, Sar -abday "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +abday "San";/ + "Man";/ + "Tun";/ + "Tri";/ + "Fon";/ + "Fra";/ + "Sar" % % Appropriate date and time representation -% %a %d %b %Y %T %Z -d_t_fmt "" +d_t_fmt "%a %d %b %Y %T %Z" % % Appropriate date representation % https://en.wikipedia.org/wiki/Date_and_time_notation_in_Australia % %d/%m/%Y -d_fmt "" +d_fmt "%d/%m/%Y" % % Appropriate time representation % %r -t_fmt "" +t_fmt "%r" % % Equivalent of AM PM -% AM -> biknait PM-> apinun (from http://wikitravel.org/en/Tok_Pisin_phrasebook) +% (from http://wikitravel.org/en/Tok_Pisin_phrasebook) % -am_pm "";/ - "" +am_pm "biknait";/ + "apinun" % % Appropriate 12 h time representation % %I:%M:%S %p %Z -t_fmt_ampm "" +t_fmt_ampm "%I:%M:%S %p %Z" +week 7;19971130;1 END LC_TIME % LC_NUMERIC -% . -decimal_point "" -% , -thousands_sep "" +decimal_point "." +thousands_sep "," grouping 3 END LC_NUMERIC % @@ -136,13 +128,13 @@ END LC_NUMERIC % https://en.wikipedia.org/wiki/Currency_symbol % K LC_MONETARY -currency_symbol "" -int_curr_symbol "" -mon_decimal_point "" -mon_thousands_sep "" +currency_symbol "K" +int_curr_symbol "PGK " +mon_decimal_point "." +mon_thousands_sep "," mon_grouping 3 positive_sign "" -negative_sign "" +negative_sign "-" int_frac_digits 2 frac_digits 2 p_cs_precedes 1 @@ -164,14 +156,10 @@ measurement 1 END LC_MEASUREMENT LC_MESSAGES -% ^[yY].* -yesexpr "" -% ^[nN].* -noexpr "" -% yes -yesstr "" -% nogat -nostr "" +yesexpr "^[+1yY]" +noexpr "^[-0nN]" +yesstr "yes" +nostr "nogat" END LC_MESSAGES LC_NAME @@ -180,38 +168,26 @@ END LC_NAME LC_ADDRESS % http://www.addressexamples.com/papua-new-guinea-address-format/ -% %a%s%z%C -postal_fmt "" -% Papua New Guinea -country_name "" -% No code +postal_fmt "%a%s%z%C" +country_name "Papua New Guinea" country_post "" -% http://laendercode.net/en/2-letter-list.html -% PG -country_ab2 "" -% PNG -% http://laendercode.net/en/countries.html -country_ab3 "" -country_car "" +country_ab2 "PG" +country_ab3 "PNG" +country_car "PNG" % https://en.wikipedia.org/wiki/ISO_3166-1_numeric country_num 598 % Tok Pisin -lang_name "" +lang_name "Tok Pisin" % https://en.wikipedia.org/wiki/Tok_Pisin -% "", "tpi", "tpi" lang_ab "" -lang_term "" -lang_lib "" +lang_term "tpi" +lang_lib "tpi" END LC_ADDRESS LC_TELEPHONE % https://www.howtocallabroad.com/papua/ -% -% +%c %l -tel_int_fmt "" -% 00 -int_select "" +tel_int_fmt "+%c %l" +int_select "00" % http://www.nationsonline.org/oneworld/international-calling-codes.htm -% 675 -int_prefix "" +int_prefix "675" END LC_TELEPHONE -- cgit v1.2.1