aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--localedata/locales/tpi_PG160
2 files changed, 75 insertions, 92 deletions
diff --git a/ChangeLog b/ChangeLog
index 265524f..e03992f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-23 Mike FABIAN <mfabian@redhat.com>
+
+ * 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 <joseph@codesourcery.com>
* sysdeps/x86/fpu/fix-fp-int-compare-invalid.h
diff --git a/localedata/locales/tpi_PG b/localedata/locales/tpi_PG
index 4f604dd..0862681 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 "<U004A><U0061><U006E><U0075><U0065><U0072><U0069>";/
- "<U0046><U0065><U0062><U0072><U0075><U0065><U0072><U0069>"
- "<U004D><U0061><U0073>";/
- "<U0045><U0070><U0072><U0069><U006C>";/
- "<U004D><U0065>";/
- "<U004A><U0075><U006E>";/
- "<U004A><U0075><U006C><U0061><U0069>";/
- "<U004F><U0067><U0061><U0073>";/
- "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0061>";/
- "<U004F><U006B><U0074><U006F><U0062><U0061>";/
- "<U004E><U006F><U0076><U0065><U006D><U0062><U0061>";/
- "<U0044><U0065><U0073><U0065><U006D><U0062><U0061>"
-%
+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 "<U004A><U0065><U006E>";/
- "<U0046><U0065><U0062>";/
- "<U004D><U0061><U0072>";/
- "<U0045><U0070><U0072>";/
- "<U004D><U0065>";/
- "<U004A><U0075><U006E>";/
- "<U004A><U0075><U006C>";/
- "<U004F><U0067><U0061>";/
- "<U0053><U0065><U0070>";/
- "<U004F><U006B><U0074>";/
- "<U004E><U006F><U0076>";/
- "<U0044><U0065><U0073>"
-%
+abmon "Jan";/
+ "Feb";/
+ "Mas";/
+ "Epr";/
+ "Me";/
+ "Jun";/
+ "Jul";/
+ "Oga";/
+ "Sep";/
+ "Okt";/
+ "Nov";/
+ "Des"
% Full Weekday names
-% Sande, Mande, Tunde, Trinde, Fonde, Fraide, Sarere
-day "<U0053><U0061><U006E><U0064><U0065>";/
- "<U004D><U0061><U006E><U0064><U0065>";/
- "<U0054><U0075><U006E><U0064><U0065>";/
- "<U0054><U0072><U0069><U006E><U0064><U0065>";/
- "<U0054><U006F><U0073><U0064><U0065>";/
- "<U0046><U0072><U0061><U0069><U0064><U0065>";/
- "<U0053><U0061><U0072><U0065><U0072><U0065>"
+day "Sande";/
+ "Mande";/
+ "Tunde";/
+ "Trinde";/
+ "Fonde";/
+ "Fraide";/
+ "Sarere"
%
% Abbreviated Weekday names
-% San, Man, Tun, Tri, Fon, Fra, Sar
-abday "<U0053><U0061><U006E>";/
- "<U004D><U0061><U006E>";/
- "<U0054><U0075><U006E>";/
- "<U0054><U0072><U0069>";/
- "<U0046><U006F><U006E>";/
- "<U0046><U0072><U0061>";/
- "<U0053><U0061><U0072>"
+abday "San";/
+ "Man";/
+ "Tun";/
+ "Tri";/
+ "Fon";/
+ "Fra";/
+ "Sar"
%
% Appropriate date and time representation
-% %a %d %b %Y %T %Z
-d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+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 "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
+d_fmt "%d/%m/%Y"
%
% Appropriate time representation
% %r
-t_fmt "<U0025><U0072>"
+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 "<U0062><U0069><U006B><U006E><U0061><U0069><U0074>";/
- "<U0061><U0070><U0069><U006E><U0075><U006E>"
+am_pm "biknait";/
+ "apinun"
%
% Appropriate 12 h time representation
% %I:%M:%S %p %Z
-t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
+t_fmt_ampm "%I:%M:%S %p %Z"
+week 7;19971130;1
END LC_TIME
%
LC_NUMERIC
-% .
-decimal_point "<U002E>"
-% ,
-thousands_sep "<U002C>"
+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 "<U004B>"
-int_curr_symbol "<U0050><U0047><U004B><U0020>"
-mon_decimal_point "<U002E>"
-mon_thousands_sep "<U002C>"
+currency_symbol "K"
+int_curr_symbol "PGK "
+mon_decimal_point "."
+mon_thousands_sep ","
mon_grouping 3
positive_sign ""
-negative_sign "<U002D>"
+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 "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
-% ^[nN].*
-noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-% yes
-yesstr "<U0079><U0065><U0073>"
-% nogat
-nostr "<U006E><U006F><U0067><U0061><U0074>"
+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 "<U0025><U0061><U0025><U0073><U0025><U007A><U0025><U0043>"
-% Papua New Guinea
-country_name "<U0050><U0061><U0070><U0075><U0061><U0020><U004E><U0065><U0077><U0020><U0047><U0075><U0069><U006E><U0065><U0061>"
-% 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 "<U0050><U0047>"
-% PNG
-% http://laendercode.net/en/countries.html
-country_ab3 "<U0050><U004E><U0047>"
-country_car "<U0050><U004E><U0047>"
+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 "<U0054><U006F><U006B><U0020><U0050><U0069><U0073><U0069><U006E>"
+lang_name "Tok Pisin"
% https://en.wikipedia.org/wiki/Tok_Pisin
-% "", "tpi", "tpi"
lang_ab ""
-lang_term "<U0074><U0070><U0069>"
-lang_lib "<U0074><U0070><U0069>"
+lang_term "tpi"
+lang_lib "tpi"
END LC_ADDRESS
LC_TELEPHONE
% https://www.howtocallabroad.com/papua/
-%
-% +%c %l
-tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U006C>"
-% 00
-int_select "<U0030><U0030>"
+tel_int_fmt "+%c %l"
+int_select "00"
% http://www.nationsonline.org/oneworld/international-calling-codes.htm
-% 675
-int_prefix "<U0036><U0037><U0035>"
+int_prefix "675"
END LC_TELEPHONE