From 68271d9e99c74ee948081ec760827ff0567673d1 Mon Sep 17 00:00:00 2001 From: Jerry Jelinek Date: Fri, 28 Aug 2015 17:57:39 -0700 Subject: [PATCH] 6179 Want various ISO8859-1 locales Reviewed by: Garrett D'Amore Reviewed by: Igor Kozhukhov Reviewed by: Toomas Soome Reviewed by: Josef 'Jeff' Sipek Reviewed by: Richard PALO Approved by: Dan McDonald --- usr/src/cmd/localedef/Makefile | 13 ++++++++----- usr/src/pkg/manifests/locale-de-extra.mf | 13 +++++++++++++ usr/src/pkg/manifests/locale-es-extra.mf | 13 +++++++++++++ usr/src/pkg/manifests/locale-fr-extra.mf | 13 +++++++++++++ usr/src/pkg/manifests/locale-it-extra.mf | 13 +++++++++++++ 5 files changed, 60 insertions(+), 5 deletions(-) diff --git a/usr/src/cmd/localedef/Makefile b/usr/src/cmd/localedef/Makefile index 5168de84a4..45cc1c88c0 100644 --- a/usr/src/cmd/localedef/Makefile +++ b/usr/src/cmd/localedef/Makefile @@ -67,13 +67,13 @@ POFILE = localedef_cmd.po ISO8859_1_LOCALES = \ da_DK \ - de_CH \ + de_CH de_DE \ en_AU en_CA en_GB en_NZ en_US \ - es_AR es_BO es_CL es_CO es_EC es_GT es_MX es_NI es_PA \ + es_AR es_BO es_CL es_CO es_EC es_ES es_GT es_MX es_NI es_PA \ es_PE es_SV es_UY es_VE \ - fr_CA fr_CH \ + fr_CA fr_CH fr_FR \ is_IS \ - it_CH \ + it_CH it_IT \ sv_SE ISO8859_2_LOCALES = \ @@ -303,8 +303,11 @@ locale/%.UTF-8/stamp: data/%.UTF-8.src UTF-8.cm \ $(SED) '/^LC_CTYPE/,/^END LC_CTYPE/d;$$r UTF-8.ct' $< | \ ./$(NPROG) -U -w data/widths.txt -f UTF-8.cm $(@D) $(TOUCH) $@ +# Convert EURO_SIGN to CURRENCY_SIGN for the ISO8859-1 locales locale/%.ISO8859-1/stamp: data/%.UTF-8.src 8859-1.cm locale $(NPROG) - ./$(NPROG) -U -w data/widths.txt -i $< -f 8859-1.cm $(@D) + sed 's/EURO_SIGN/CURRENCY_SIGN/' $< > $<.tmp + ./$(NPROG) -U -w data/widths.txt -i $<.tmp -f 8859-1.cm $(@D) + rm -f $<.tmp $(TOUCH) $@ locale/%.ISO8859-2/stamp: data/%.UTF-8.src 8859-2.cm locale $(NPROG) ./$(NPROG) -U -w data/widths.txt -i $< -f 8859-2.cm $(@D) diff --git a/usr/src/pkg/manifests/locale-de-extra.mf b/usr/src/pkg/manifests/locale-de-extra.mf index ee4ee0dd4d..e27e535612 100644 --- a/usr/src/pkg/manifests/locale-de-extra.mf +++ b/usr/src/pkg/manifests/locale-de-extra.mf @@ -40,6 +40,13 @@ dir path=usr/lib/locale/de_CH.ISO8859-1/LC_MESSAGES dir path=usr/lib/locale/de_CH.ISO8859-1/LC_MONETARY dir path=usr/lib/locale/de_CH.ISO8859-1/LC_NUMERIC dir path=usr/lib/locale/de_CH.ISO8859-1/LC_TIME +dir path=usr/lib/locale/de_DE.ISO8859-1 +dir path=usr/lib/locale/de_DE.ISO8859-1/LC_COLLATE +dir path=usr/lib/locale/de_DE.ISO8859-1/LC_CTYPE +dir path=usr/lib/locale/de_DE.ISO8859-1/LC_MESSAGES +dir path=usr/lib/locale/de_DE.ISO8859-1/LC_MONETARY +dir path=usr/lib/locale/de_DE.ISO8859-1/LC_NUMERIC +dir path=usr/lib/locale/de_DE.ISO8859-1/LC_TIME dir path=usr/lib/locale/de_DE.ISO8859-15 dir path=usr/lib/locale/de_DE.ISO8859-15/LC_COLLATE dir path=usr/lib/locale/de_DE.ISO8859-15/LC_CTYPE @@ -59,6 +66,12 @@ file path=usr/lib/locale/de_CH.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 file path=usr/lib/locale/de_CH.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 file path=usr/lib/locale/de_CH.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 file path=usr/lib/locale/de_CH.ISO8859-1/LC_TIME/LCL_DATA mode=0444 +file path=usr/lib/locale/de_DE.ISO8859-1/LC_COLLATE/LCL_DATA mode=0444 +file path=usr/lib/locale/de_DE.ISO8859-1/LC_CTYPE/LCL_DATA mode=0444 +file path=usr/lib/locale/de_DE.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 +file path=usr/lib/locale/de_DE.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 +file path=usr/lib/locale/de_DE.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 +file path=usr/lib/locale/de_DE.ISO8859-1/LC_TIME/LCL_DATA mode=0444 file path=usr/lib/locale/de_DE.ISO8859-15/LC_COLLATE/LCL_DATA mode=0444 file path=usr/lib/locale/de_DE.ISO8859-15/LC_CTYPE/LCL_DATA mode=0444 file path=usr/lib/locale/de_DE.ISO8859-15/LC_MESSAGES/LCL_DATA mode=0444 diff --git a/usr/src/pkg/manifests/locale-es-extra.mf b/usr/src/pkg/manifests/locale-es-extra.mf index 1334489f36..0631679b9e 100644 --- a/usr/src/pkg/manifests/locale-es-extra.mf +++ b/usr/src/pkg/manifests/locale-es-extra.mf @@ -61,6 +61,13 @@ dir path=usr/lib/locale/es_EC.ISO8859-1/LC_MESSAGES dir path=usr/lib/locale/es_EC.ISO8859-1/LC_MONETARY dir path=usr/lib/locale/es_EC.ISO8859-1/LC_NUMERIC dir path=usr/lib/locale/es_EC.ISO8859-1/LC_TIME +dir path=usr/lib/locale/es_ES.ISO8859-1 +dir path=usr/lib/locale/es_ES.ISO8859-1/LC_COLLATE +dir path=usr/lib/locale/es_ES.ISO8859-1/LC_CTYPE +dir path=usr/lib/locale/es_ES.ISO8859-1/LC_MESSAGES +dir path=usr/lib/locale/es_ES.ISO8859-1/LC_MONETARY +dir path=usr/lib/locale/es_ES.ISO8859-1/LC_NUMERIC +dir path=usr/lib/locale/es_ES.ISO8859-1/LC_TIME dir path=usr/lib/locale/es_ES.ISO8859-15 dir path=usr/lib/locale/es_ES.ISO8859-15/LC_COLLATE dir path=usr/lib/locale/es_ES.ISO8859-15/LC_CTYPE @@ -154,6 +161,12 @@ file path=usr/lib/locale/es_EC.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 file path=usr/lib/locale/es_EC.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 file path=usr/lib/locale/es_EC.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 file path=usr/lib/locale/es_EC.ISO8859-1/LC_TIME/LCL_DATA mode=0444 +file path=usr/lib/locale/es_ES.ISO8859-1/LC_COLLATE/LCL_DATA mode=0444 +file path=usr/lib/locale/es_ES.ISO8859-1/LC_CTYPE/LCL_DATA mode=0444 +file path=usr/lib/locale/es_ES.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 +file path=usr/lib/locale/es_ES.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 +file path=usr/lib/locale/es_ES.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 +file path=usr/lib/locale/es_ES.ISO8859-1/LC_TIME/LCL_DATA mode=0444 file path=usr/lib/locale/es_ES.ISO8859-15/LC_COLLATE/LCL_DATA mode=0444 file path=usr/lib/locale/es_ES.ISO8859-15/LC_CTYPE/LCL_DATA mode=0444 file path=usr/lib/locale/es_ES.ISO8859-15/LC_MESSAGES/LCL_DATA mode=0444 diff --git a/usr/src/pkg/manifests/locale-fr-extra.mf b/usr/src/pkg/manifests/locale-fr-extra.mf index 3b24490e86..69d9258170 100644 --- a/usr/src/pkg/manifests/locale-fr-extra.mf +++ b/usr/src/pkg/manifests/locale-fr-extra.mf @@ -47,6 +47,13 @@ dir path=usr/lib/locale/fr_CH.ISO8859-1/LC_MESSAGES dir path=usr/lib/locale/fr_CH.ISO8859-1/LC_MONETARY dir path=usr/lib/locale/fr_CH.ISO8859-1/LC_NUMERIC dir path=usr/lib/locale/fr_CH.ISO8859-1/LC_TIME +dir path=usr/lib/locale/fr_FR.ISO8859-1 +dir path=usr/lib/locale/fr_FR.ISO8859-1/LC_COLLATE +dir path=usr/lib/locale/fr_FR.ISO8859-1/LC_CTYPE +dir path=usr/lib/locale/fr_FR.ISO8859-1/LC_MESSAGES +dir path=usr/lib/locale/fr_FR.ISO8859-1/LC_MONETARY +dir path=usr/lib/locale/fr_FR.ISO8859-1/LC_NUMERIC +dir path=usr/lib/locale/fr_FR.ISO8859-1/LC_TIME dir path=usr/lib/locale/fr_FR.ISO8859-15 dir path=usr/lib/locale/fr_FR.ISO8859-15/LC_COLLATE dir path=usr/lib/locale/fr_FR.ISO8859-15/LC_CTYPE @@ -72,6 +79,12 @@ file path=usr/lib/locale/fr_CH.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 file path=usr/lib/locale/fr_CH.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 file path=usr/lib/locale/fr_CH.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 file path=usr/lib/locale/fr_CH.ISO8859-1/LC_TIME/LCL_DATA mode=0444 +file path=usr/lib/locale/fr_FR.ISO8859-1/LC_COLLATE/LCL_DATA mode=0444 +file path=usr/lib/locale/fr_FR.ISO8859-1/LC_CTYPE/LCL_DATA mode=0444 +file path=usr/lib/locale/fr_FR.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 +file path=usr/lib/locale/fr_FR.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 +file path=usr/lib/locale/fr_FR.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 +file path=usr/lib/locale/fr_FR.ISO8859-1/LC_TIME/LCL_DATA mode=0444 file path=usr/lib/locale/fr_FR.ISO8859-15/LC_COLLATE/LCL_DATA mode=0444 file path=usr/lib/locale/fr_FR.ISO8859-15/LC_CTYPE/LCL_DATA mode=0444 file path=usr/lib/locale/fr_FR.ISO8859-15/LC_MESSAGES/LCL_DATA mode=0444 diff --git a/usr/src/pkg/manifests/locale-it-extra.mf b/usr/src/pkg/manifests/locale-it-extra.mf index 380721322e..6e044efde4 100644 --- a/usr/src/pkg/manifests/locale-it-extra.mf +++ b/usr/src/pkg/manifests/locale-it-extra.mf @@ -33,6 +33,13 @@ dir path=usr/lib/locale/it_CH.ISO8859-1/LC_MESSAGES dir path=usr/lib/locale/it_CH.ISO8859-1/LC_MONETARY dir path=usr/lib/locale/it_CH.ISO8859-1/LC_NUMERIC dir path=usr/lib/locale/it_CH.ISO8859-1/LC_TIME +dir path=usr/lib/locale/it_IT.ISO8859-1 +dir path=usr/lib/locale/it_IT.ISO8859-1/LC_COLLATE +dir path=usr/lib/locale/it_IT.ISO8859-1/LC_CTYPE +dir path=usr/lib/locale/it_IT.ISO8859-1/LC_MESSAGES +dir path=usr/lib/locale/it_IT.ISO8859-1/LC_MONETARY +dir path=usr/lib/locale/it_IT.ISO8859-1/LC_NUMERIC +dir path=usr/lib/locale/it_IT.ISO8859-1/LC_TIME dir path=usr/lib/locale/it_IT.ISO8859-15 dir path=usr/lib/locale/it_IT.ISO8859-15/LC_COLLATE dir path=usr/lib/locale/it_IT.ISO8859-15/LC_CTYPE @@ -46,6 +53,12 @@ file path=usr/lib/locale/it_CH.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 file path=usr/lib/locale/it_CH.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 file path=usr/lib/locale/it_CH.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 file path=usr/lib/locale/it_CH.ISO8859-1/LC_TIME/LCL_DATA mode=0444 +file path=usr/lib/locale/it_IT.ISO8859-1/LC_COLLATE/LCL_DATA mode=0444 +file path=usr/lib/locale/it_IT.ISO8859-1/LC_CTYPE/LCL_DATA mode=0444 +file path=usr/lib/locale/it_IT.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444 +file path=usr/lib/locale/it_IT.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444 +file path=usr/lib/locale/it_IT.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444 +file path=usr/lib/locale/it_IT.ISO8859-1/LC_TIME/LCL_DATA mode=0444 file path=usr/lib/locale/it_IT.ISO8859-15/LC_COLLATE/LCL_DATA mode=0444 file path=usr/lib/locale/it_IT.ISO8859-15/LC_CTYPE/LCL_DATA mode=0444 file path=usr/lib/locale/it_IT.ISO8859-15/LC_MESSAGES/LCL_DATA mode=0444 -- 2.11.4.GIT