--000e0cd32d18dfe1f604685d2afc
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Hi everyone,

Currently the Country/Region & Language KControl module only lists one
language in its "Add languages" list ( US English ). The attached
patch corrects this, ensuring that all installed languages with
translations for that module are available for adding. This also fixes
the automatic adding of the correct languages for a country/region.

May I commit?

Regards,
Ben Cooksley.

--000e0cd32d18dfe1f604685d2afc
Content-Type: text/x-patch; charset=UTF-8; name="locale-patch.patch"
Content-Disposition: attachment; filename="locale-patch.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: file0

SW5kZXg6IGRlZmF1bHQvZW50cnkuZGVza3RvcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBkZWZhdWx0L2VudHJ5
LmRlc2t0b3AJKHJldmlzaW9uIDk1ODkyMCkKKysrIGRlZmF1bHQvZW50cnkuZGVza3RvcAkod29y
a2luZyBjb3B5KQpAQCAtMSw4MSArMCwwIEBACi1bS0NNIExvY2FsZV0KLU5hbWU9VVMgRW5nbGlz
aAotTmFtZVthZl09QW1lcmlrYWFuc2UgRW5nZWxzCi1OYW1lW2FyXT3YpdmG2YPZhNmK2LLZitip
INin2YTZiNmE2KfZitin2Kog2KfZhNmF2KrYrdiv2Kkg2KfZhNij2YXYsdmK2YPZitipCi1OYW1l
W2JlXT3QkNC90LPQu9GW0LnRgdC60LDRjyAo0JfQqNCQKQotTmFtZVtiZUBsYXRpbl09QW5oaWVs
c2thamEgKFrFoEEpCi1OYW1lW2JnXT3QkNC80LXRgNC40LrQsNC90YHQutC4INCw0L3Qs9C70LjQ
udGB0LrQuAotTmFtZVtibl9JTl094Kau4Ka+4Kaw4KeN4KaV4Ka/4KaoIOCmh+CmguCmsOCmvuCm
nOCmvwotTmFtZVticl09U2Fvem5lZyBTVUEKLU5hbWVbY2FdPUFuZ2zDqHMgVVMKLU5hbWVbY2FA
dmFsZW5jaWFdPUFuZ2zDqHMgVVMKLU5hbWVbY3NdPUFtZXJpY2vDoSBhbmdsacSNdGluYQotTmFt
ZVtjc2JdPUFtZXJpa2HFhHNjemkgYW5pZWxzY3ppCi1OYW1lW2N5XT1TYWVzbmVnIFVECi1OYW1l
W2RhXT1FbmdlbHNrIChVUykKLU5hbWVbZGVdPVVTLUVuZ2xpc2NoCi1OYW1lW2VsXT3Okc6zzrPO
u865zrrOriDOl86gzpEKLU5hbWVbZW9dPVVzb25hIGFuZ2xhCi1OYW1lW2VzXT1Jbmdsw6lzIGRl
IEVFVVUKLU5hbWVbZXRdPUluZ2xpc2UgKFVTKQotTmFtZVtldV09RUVCQmV0YWtvIGluZ2VsZXNh
Ci1OYW1lW2ZhXT3Yp9mG2q/ZhNuM2LPbjCDYp9mF2LHbjNqp2KfbjNuMCi1OYW1lW2ZpXT1ZaGR5
c3ZhbHRhaW4gZW5nbGFudGkKLU5hbWVbZnJdPUFuZ2xhaXMgVVMKLU5hbWVbZnldPVZTIEluZ2Vs
c2sKLU5hbWVbZ2xdPUluZ2zDqXMgZG9zIEVFVVUKLU5hbWVbZ3VdPVVTIOCqheCqguCql+CrjeCq
sOCrh+CqnOCrgAotTmFtZVtoZV0915DXoNeS15zXmdeqINeQ16jXlCLXkQotTmFtZVtoaV094KSv
4KWC4KSP4KS4IOCkheCkguCkl+CljeCksOClh+CknOClgAotTmFtZVtobmVdPeCkr+ClguCkj+Ck
uCDgpIXgpILgpJfgpLDgpYfgpJzgpYAKLU5hbWVbaHJdPUFtZXJpxI1raSBlbmdsZXNraQotTmFt
ZVtoc2JdPUFtZXJpc2thIGplbmTFumVsxaHEh2luYQotTmFtZVtodV09QW1lcmlrYWkgYW5nb2wK
LU5hbWVbaXNdPUVuc2thIChCTkEpCi1OYW1lW2l0XT1JbmdsZXNlIFVTCi1OYW1lW2phXT3oi7Ho
qp4gKOOCouODoeODquOCqykKLU5hbWVba2FdPeGDmOGDnOGDkuGDmuGDmOGDoeGDo+GDoOGDmCAo
4YOQ4YOo4YOoKQotTmFtZVtra1090JDSk9GL0LvRiNGL0L0gKNCQ0prQqCkKLU5hbWVba21dPeGe
ouGehOGfi+GeguGfkuGem+GfgeGenyDhnqLhnrbhnpjhn4HhnprhnrfhnoAKLU5hbWVba25dPeCy
r+CzgSDgso7gsrjgs40g4LKG4LKC4LKX4LON4LKyCi1OYW1lW2tvXT3rr7jqta0g7JiB7Ja0Ci1O
YW1lW2t1XT3Djm5naWzDrnppeWEgRFlBCi1OYW1lW2x0XT1KQVYgYW5nbMWzCi1OYW1lW2x2XT1B
U1YgYW5nxLx1Ci1OYW1lW21haV094KSv4KWC4KSP4KS4IOCkheCkguCkl+CljeCksOClh+CknOCl
gAotTmFtZVtta1090JDQvdCz0LvQuNGB0LrQuCAo0KHQkNCUKQotTmFtZVttbF094LSv4LWB4LSO
4LS44LWNIOC0h+C0guC0l+C1jeC0suC1gOC0t+C1jQotTmFtZVttcl09VVMg4KSF4KSC4KSX4KWN
4KSw4KWH4KSc4KWACi1OYW1lW21zXT1CYWhhc2EgSW5nZ2VyaXMgQVMKLU5hbWVbbmJdPUVuZ2Vs
c2sgKFVTQSkKLU5hbWVbbmRzXT1FbmdlbHNjaCAoVVMpCi1OYW1lW25lXT1VUyDgpIXgpJngpY3g
pJfgpY3gpLDgpYfgpJzgpYAKLU5hbWVbbmxdPVZTIEVuZ2VscwotTmFtZVtubl09RW5nZWxzayAo
VVNBKQotTmFtZVtvcl09VVMg4KyH4KyC4Kyw4Ky+4Kyc4K2ACi1OYW1lW3BhXT3gqIXgqK7gqLDg
qYDgqJXgqYAg4KiF4Kmw4KiX4Kiw4KmH4Kmb4KmACi1OYW1lW3BsXT1BbWVyeWthxYRza2kgYW5n
aWVsc2tpCi1OYW1lW3B0XT1Jbmdsw6pzIGRvcyBFVUEKLU5hbWVbcHRfQlJdPUluZ2zDqnMgZG9z
IEVVQQotTmFtZVtyb109RW5nbGV6xIMgU1VBCi1OYW1lW3J1XT3QkNC90LPQu9C40LnRgdC60LjQ
uSAo0KHQqNCQKQotTmFtZVtzZV09RcWLZ2VsYXNnaWVsbGEgKFVTQSkKLU5hbWVbc2ldPeC2keC2
muC3iuC3g+C2reC3iiDgtqLgtrHgtrTgtq8g4LaJ4LaC4Lac4LeK4oCN4La74LeT4LeD4LeSCi1O
YW1lW3NrXT1BbmdsaWNrw70gVVMKLU5hbWVbc2xdPUFuZ2xlxaFrbyBaREEKLU5hbWVbc3JdPdCw
0LzQtdGA0LjRh9C60Lgg0LXQvdCz0LvQtdGB0LrQuAotTmFtZVtzckBsYXRpbl09YW1lcmnEjWtp
IGVuZ2xlc2tpCi1OYW1lW3N2XT1BbWVyaWthbnNrIGVuZ2Vsc2thCi1OYW1lW3RhXT1VUyDgrobg
rpngr43grpXgrr/grrLgrq7gr40KLU5hbWVbdGVdPeCwr+CxguCwjuCwuOCxjSDgsIbgsILgsJfg
sY3gsLLgsIIKLU5hbWVbdGddPdCQ0L3Qs9C70LjRgdOjICjQqNCc0JApCi1OYW1lW3RoXT3guK3g
uLHguIfguIHguKTguKkg4Lit4LmA4Lih4Lij4Li04LiB4Lix4LiZCi1OYW1lW3RyXT1BbWVyaWth
biDEsG5naWxpemNlc2kKLU5hbWVbdWtdPdCQ0L3Qs9C70ZbQudGB0YzQutCwICjQodCo0JApCi1O
YW1lW3V6XT1JbmdsaXpjaGEgQVFTSAotTmFtZVt1ekBjeXJpbGxpY1090JjQvdCz0LvQuNC30YfQ
sCBB0prQqAotTmFtZVt2aV09VGnhur9uZyBBbmggKE3hu7kpCi1OYW1lW3dhXT1Jbmdsw6hzIGRl
cyBFc3RhdHMtVW5pcwotTmFtZVt4LXRlc3RdPXh4VVMgRW5nbGlzaHh4Ci1OYW1lW3poX0NOXT3n
vo7lm73oi7Hor60KLU5hbWVbemhfVFddPeiLseiqniAtIFVTCkluZGV4OiBkZWZhdWx0L0NNYWtl
TGlzdHMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIGRlZmF1bHQvQ01ha2VMaXN0cy50eHQJKHJldmlzaW9u
IDk1ODkyMCkKKysrIGRlZmF1bHQvQ01ha2VMaXN0cy50eHQJKHdvcmtpbmcgY29weSkKQEAgLTEg
KzAsMCBAQAotaW5zdGFsbCggRklMRVMgZW50cnkuZGVza3RvcCAgREVTVElOQVRJT04gICR7TE9D
QUxFX0lOU1RBTExfRElSfS9lbl9VUyApCkluZGV4OiBrY21sb2NhbGUuY3BwCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIGtjbWxvY2FsZS5jcHAJKHJldmlzaW9uIDk1ODkyMCkKKysrIGtjbWxvY2FsZS5jcHAJKHdv
cmtpbmcgY29weSkKQEAgLTUzLDIxICs1Myw3IEBACiAgIHJldHVybiBlbnRyeS5yZWFkRW50cnko
Ikxhbmd1YWdlcyIsIFFTdHJpbmdMaXN0KCkpOwogfQogCi1zdGF0aWMgUVN0cmluZyByZWFkTG9j
YWxlKGNvbnN0IFFTdHJpbmcgJmxhbmd1YWdlLCBjb25zdCBRU3RyaW5nICZwYXRoLCBjb25zdCBR
U3RyaW5nICZzdWI9UVN0cmluZygpKQotewotICAvLyByZWFkIHRoZSBuYW1lCi0gIFFTdHJpbmcg
ZmlsZXBhdGggPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCIlMSUyL2VudHJ5LmRlc2t0b3AiKQotICAg
IC5hcmcoc3ViKQotICAgIC5hcmcocGF0aCk7CiAKLSAgS0NvbmZpZyBlbnRyeShLU3RhbmRhcmRE
aXJzOjpsb2NhdGUoImxvY2FsZSIsIGZpbGVwYXRoKSk7Ci0gIGVudHJ5LnNldExvY2FsZShsYW5n
dWFnZSk7Ci0gIEtDb25maWdHcm91cCBlbnRyeUdyb3VwID0gZW50cnkuZ3JvdXAoIktDTSBMb2Nh
bGUiKTsKLSAgcmV0dXJuIGVudHJ5R3JvdXAucmVhZEVudHJ5KCJOYW1lIik7Ci19Ci0KLQotCiBL
TG9jYWxlQ29uZmlnOjpLTG9jYWxlQ29uZmlnKEtDb250cm9sTG9jYWxlICpsb2NhbGUsIFFXaWRn
ZXQgKnBhcmVudCkKICAgOiBRV2lkZ2V0IChwYXJlbnQpLAogICAgIG1fbG9jYWxlKGxvY2FsZSkK
QEAgLTk1LDcgKzgxLDE1IEBACiAgICAgbV91cEJ1dHRvbi0+c2V0SWNvbihLSWNvbigiYXJyb3ct
dXAiKSk7CiAgICAgbV9kb3duQnV0dG9uLT5zZXRJY29uKEtJY29uKCJhcnJvdy1kb3duIikpOwog
Ci0gICAgbGFuZ3VhZ2VBZGQtPmxvYWRBbGxMYW5ndWFnZXMoKTsKKyAgICBjb25zdCBRU3RyaW5n
TGlzdCBhbGxMYW5ndWFnZXMgPSBsb2NhbGUtPmFsbExhbmd1YWdlc0xpc3QoKTsKKyAgICBmb3Jl
YWNoICggUVN0cmluZyBsYW5nQ29kZSwgYWxsTGFuZ3VhZ2VzICkKKyAgICB7CisgICAgICAgIGlm
IChsb2NhbGUtPmlzQXBwbGljYXRpb25UcmFuc2xhdGVkSW50byhsYW5nQ29kZSkpCisgICAgICAg
IHsKKyAgICAgICAgICAgIGxhbmd1YWdlQWRkLT5pbnNlcnRMYW5ndWFnZShsYW5nQ29kZSk7Cisg
ICAgICAgIH0KKyAgICB9CisgICAgbGFuZ3VhZ2VBZGQtPnNldEN1cnJlbnRJdGVtKGxvY2FsZS0+
bGFuZ3VhZ2UoKSk7CiAgICAgCiAgICAgS0NvbmZpZ0dyb3VwIGNvbmZpZ0dyb3VwID0gS0dsb2Jh
bDo6Y29uZmlnKCktPmdyb3VwKCJMb2NhbGUiKTsKICAgICBtX2xhbmd1YWdlTGlzdCA9IGNvbmZp
Z0dyb3VwLnJlYWRFbnRyeSgiTGFuZ3VhZ2UiKS5zcGxpdCgnOicsUVN0cmluZzo6U2tpcEVtcHR5
UGFydHMpOwpAQCAtMjA1LDcgKzE5OSw3IEBACiAgIC8vIHVwZGF0ZSBsYW5ndWFnZSB3aWRnZXQK
ICAgbV9sYW5ndWFnZXMtPmNsZWFyKCk7CiAgIGZvcmVhY2ggKGNvbnN0IFFTdHJpbmcmIGxhbmdD
b2RlLCBtX2xhbmd1YWdlTGlzdCkKLSAgICBtX2xhbmd1YWdlcy0+YWRkSXRlbShyZWFkTG9jYWxl
KG1fbG9jYWxlLT5sYW5ndWFnZSgpLGxhbmdDb2RlKSk7CisgICAgbV9sYW5ndWFnZXMtPmFkZEl0
ZW0obV9sb2NhbGUtPmxhbmd1YWdlQ29kZVRvTmFtZShsYW5nQ29kZSkpOwogICBzbG90Q2hlY2tC
dXR0b25zKCk7CiAKICAgUVN0cmluZyBjb3VudHJ5ID0gbV9sb2NhbGUtPmNvdW50cnlDb2RlVG9O
YW1lKG1fbG9jYWxlLT5jb3VudHJ5KCkpOwpAQCAtMjY1LDcgKzI1OSw3IEBACiAgIFFTdHJpbmdM
aXN0IG5ld0xhbmd1YWdlTGlzdDsKICAgZm9yZWFjaCAoY29uc3QgUVN0cmluZyYgbGFuZ0NvZGUs
IGxhbmd1YWdlcykKICAgewotICAgIGlmICghcmVhZExvY2FsZShtX2xvY2FsZS0+bGFuZ3VhZ2Uo
KSxsYW5nQ29kZSkuaXNFbXB0eSgpKQorICAgIGlmICghbV9sb2NhbGUtPmxhbmd1YWdlQ29kZVRv
TmFtZShsYW5nQ29kZSkuaXNFbXB0eSgpKQogICAgICAgbmV3TGFuZ3VhZ2VMaXN0ICs9IGxhbmdD
b2RlOwogICB9CiAgIG1fbG9jYWxlLT5zZXRMYW5ndWFnZSggbmV3TGFuZ3VhZ2VMaXN0ICk7Cg==
--000e0cd32d18dfe1f604685d2afc--