 Issue 29564702:
  Issue 5636 - Refactored language selector to use og locale location codes instead of locale codes  (Closed) 
  Base URL: https://bitbucket.org/adblockplus/adblockplus.org
    
  
    Issue 29564702:
  Issue 5636 - Refactored language selector to use og locale location codes instead of locale codes  (Closed) 
  Base URL: https://bitbucket.org/adblockplus/adblockplus.org| Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 1 {# | 1 {# | 
| 2 # This file is part of the Adblock Plus website, | 2 # This file is part of the Adblock Plus website, | 
| 3 # Copyright (C) 2006-present eyeo GmbH | 3 # Copyright (C) 2006-present eyeo GmbH | 
| 4 # | 4 # | 
| 5 # Adblock Plus is free software: you can redistribute it and/or modify | 5 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 6 # it under the terms of the GNU General Public License version 3 as | 6 # it under the terms of the GNU General Public License version 3 as | 
| 7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. | 
| 8 # | 8 # | 
| 9 # Adblock Plus is distributed in the hope that it will be useful, | 9 # Adblock Plus is distributed in the hope that it will be useful, | 
| 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 {% if localefile == "index" %} | 91 {% if localefile == "index" %} | 
| 92 <li class="selected first">{{get_string("installation", "menu")}}</l i> | 92 <li class="selected first">{{get_string("installation", "menu")}}</l i> | 
| 93 {% else %} | 93 {% else %} | 
| 94 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li> | 94 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li> | 
| 95 {% endif %} | 95 {% endif %} | 
| 96 {% for name in ["about", "features", "bugs", "contribute"] %} | 96 {% for name in ["about", "features", "bugs", "contribute"] %} | 
| 97 {{pageitem(name)}} | 97 {{pageitem(name)}} | 
| 98 {% endfor %} | 98 {% endfor %} | 
| 99 <li id="language"> | 99 <li id="language"> | 
| 100 <div id="current-language"> | 100 <div id="current-language"> | 
| 101 {{ config.get("langnames", locale) }} ({{ locale | upper }}) | 101 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) | 
| 
ire
2017/10/04 22:09:35
NIT: I'm not 100% sure about building the `to_og_l
 
juliandoucette
2017/10/05 12:11:12
Funny you should say... https://issues.adblockplus
 | |
| 102 <span id="language-arrow" class="sprite"></span> | 102 <span id="language-arrow" class="sprite"></span> | 
| 103 </div> | 103 </div> | 
| 104 <ul id="language-selector"> | 104 <ul id="language-selector"> | 
| 105 {% for available_locale in available_locales %} | 105 {% for available_locale in available_locales %} | 
| 106 <li class="language-entry"> | 106 <li class="language-entry"> | 
| 107 {{ page | linkify(available_locale) }} | 107 {{ page | linkify(available_locale) }} | 
| 108 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | upper }}) | 108 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }}) | 
| 109 </a> | 109 </a> | 
| 110 </li> | 110 </li> | 
| 111 {% endfor %} | 111 {% endfor %} | 
| 112 </ul> | 112 </ul> | 
| 113 </li> | 113 </li> | 
| 114 </ul> | 114 </ul> | 
| 115 <a href="#" id="hamburger"></a> | 115 <a href="#" id="hamburger"></a> | 
| 116 </nav> | 116 </nav> | 
| 117 </header> | 117 </header> | 
| 118 | 118 | 
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> | 195 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> | 
| 196 </li> | 196 </li> | 
| 197 </ul> | 197 </ul> | 
| 198 </section> | 198 </section> | 
| 199 </div> | 199 </div> | 
| 200 </footer> | 200 </footer> | 
| 201 | 201 | 
| 202 <script src="/js/main.js"></script> | 202 <script src="/js/main.js"></script> | 
| 203 </body> | 203 </body> | 
| 204 </html> | 204 </html> | 
| OLD | NEW |