BBlack has submitted this change and it was merged. Change subject: geolanglist: always use text-lb for primary ......................................................................
geolanglist: always use text-lb for primary This is the case in all usage today, so this is just a simplification before other changes... Change-Id: I2853befffc45b0fba972260c3e1e227254a390bb --- M templates/helpers/langlist.tmpl M templates/wikibooks.org M templates/wikimedia.com M templates/wikimedia.community M templates/wikimedia.ee M templates/wikinews.org M templates/wikipedia.org M templates/wikiquote.org M templates/wikisource.org M templates/wikiversity.org M templates/wikivoyage.org M templates/wiktionary.org 12 files changed, 15 insertions(+), 15 deletions(-) Approvals: Faidon Liambotis: Looks good to me, but someone else must approve BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/helpers/langlist.tmpl b/templates/helpers/langlist.tmpl index c236b61..1630d50 100644 --- a/templates/helpers/langlist.tmpl +++ b/templates/helpers/langlist.tmpl @@ -1,13 +1,13 @@ {% from "helpers/langs.tmpl" import langs %} -{% macro geolang(lang, dyna) -%} -{{ lang }} 600 IN DYNA geoip!{{ dyna }} +{% macro geolang(lang) -%} +{{ lang }} 600 IN DYNA geoip!text-addrs {{ lang }}.m 600 IN DYNA geoip!mobile-addrs {{ lang }}.zero 600 IN DYNA geoip!mobile-addrs {%- endmacro %} -{% macro geolanglist(dyna) -%} +{% macro geolanglist() -%} {% for lang in langs -%} -{{ geolang(lang, dyna) }} +{{ geolang(lang) }} {% endfor %} {%- endmacro %} diff --git a/templates/wikibooks.org b/templates/wikibooks.org index 390bd68..60e05f4 100644 --- a/templates/wikibooks.org +++ b/templates/wikibooks.org @@ -37,7 +37,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs diff --git a/templates/wikimedia.com b/templates/wikimedia.com index 37959f2..2ff27ac 100644 --- a/templates/wikimedia.com +++ b/templates/wikimedia.com @@ -34,4 +34,4 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} diff --git a/templates/wikimedia.community b/templates/wikimedia.community index 9d2a40f..035993b 100644 --- a/templates/wikimedia.community +++ b/templates/wikimedia.community @@ -37,6 +37,6 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Other websites diff --git a/templates/wikimedia.ee b/templates/wikimedia.ee index e814a96..29788ac 100644 --- a/templates/wikimedia.ee +++ b/templates/wikimedia.ee @@ -34,6 +34,6 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Other websites diff --git a/templates/wikinews.org b/templates/wikinews.org index 532dc3d..133efed 100644 --- a/templates/wikinews.org +++ b/templates/wikinews.org @@ -37,7 +37,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here. -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs diff --git a/templates/wikipedia.org b/templates/wikipedia.org index 51517bf..fdcf00c 100644 --- a/templates/wikipedia.org +++ b/templates/wikipedia.org @@ -65,7 +65,7 @@ ; All languages will automatically be included here -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Other websites diff --git a/templates/wikiquote.org b/templates/wikiquote.org index d654433..5a16eb4 100644 --- a/templates/wikiquote.org +++ b/templates/wikiquote.org @@ -37,7 +37,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here. -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs diff --git a/templates/wikisource.org b/templates/wikisource.org index c97956a..e08a381 100644 --- a/templates/wikisource.org +++ b/templates/wikisource.org @@ -37,7 +37,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here. -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs diff --git a/templates/wikiversity.org b/templates/wikiversity.org index a73875a..f7583b5 100644 --- a/templates/wikiversity.org +++ b/templates/wikiversity.org @@ -39,7 +39,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here. -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs diff --git a/templates/wikivoyage.org b/templates/wikivoyage.org index 945c1af..9f38ba6 100644 --- a/templates/wikivoyage.org +++ b/templates/wikivoyage.org @@ -37,7 +37,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here. -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs diff --git a/templates/wiktionary.org b/templates/wiktionary.org index 403fe00..9e3acf1 100644 --- a/templates/wiktionary.org +++ b/templates/wiktionary.org @@ -37,7 +37,7 @@ www 600 IN DYNA geoip!text-addrs ; All languages will automatically be included here. -{{ geolanglist('text-addrs') }} +{{ geolanglist() }} ; Mobile m 600 IN DYNA geoip!mobile-addrs -- To view, visit https://gerrit.wikimedia.org/r/227243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2853befffc45b0fba972260c3e1e227254a390bb Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits