Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Update Spanish translations. #316

Merged
merged 1 commit into from Feb 19, 2014

Conversation

Projects
None yet
2 participants
Contributor

wbnns commented Feb 15, 2014

Update _translations/es.yml with new translations (in particular, the FAQ)
Remove "es:true" from _redirects/about.yml
Remove "es:true" from _redirects/bitcoin-for-enthusiasts.yml

Contributor

saivann commented Feb 15, 2014

Thanks! Can you remove all fallback HTML code from _templates/* and _layouts/* ?
https://github.com/bitcoin/bitcoin.org#import-translations

Look at this commit as an example: 0450ae5

These pages are still serving outdated content for the Spanish language. You can find what pages need to be fixed with a simple:

grep -R "'es'" _templates/*
Contributor

wbnns commented Feb 15, 2014

@saivann - should be removed now. I think I removed the correct tags but if you could please give it a sanity check I would appreciate it! :)

@saivann saivann and 1 other commented on an outdated diff Feb 16, 2014

_layouts/base.html
@@ -24,7 +24,7 @@
{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %}
{% if page.lang == 'bg' or page.lang == 'pl' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %}
<script type="text/javascript" src="/js/main.js"></script>
-{% if page.lang == 'de' or page.lang == 'es' or page.lang == 'it' or page.lang == 'nl' or page.lang == 'pl' or page.lang == 'ru' or page.lang == 'tr' %}
@saivann

saivann Feb 16, 2014

Contributor

This one should be left unchanged (it is being used to load hyphenator.js only for some languages)

@wbnns

wbnns Feb 17, 2014

Contributor

Fixed.

@saivann saivann and 1 other commented on an outdated diff Feb 16, 2014

_templates/community.html
{% else %}
<li>{% translate linkmeetup %}</li>
{% endcase %}
-{% if page.lang == 'es' %}
-<li><a href="http://www.forobtc.com/">Foro Bitcoin en Español</a></li>
-{% endif %}
@saivann

saivann Feb 16, 2014

Contributor

These links are only displayed to Spanish speakers, it is sometime useful to keep a few contextual links for each language like these.

@wbnns

wbnns Feb 17, 2014

Contributor

Fixed.

@saivann saivann and 1 other commented on an outdated diff Feb 16, 2014

_templates/community.html
@@ -89,17 +81,12 @@
{% if page.lang == 'fr' %}
<p>#bitcoin-fr <small>(Le Bitcoin en général, français)</small></li>
{% endif %}
- {% if page.lang == 'es' %}
- <p>#bitcoin-ar <small>(Comunidad Bitcoin Argentina)</small></li>
- <p>#bitcoin-es <small>(Comunidad Bitcoin en español)</small></li>
- <p>#bitcoin-otc-ar <small>(Mercado OTC de Bitcoin en Argentina)</small></li>
- {% endif %}
@saivann

saivann Feb 16, 2014

Contributor

These links are only displayed to Spanish speakers, it is sometime useful to keep a few contextual links for each language like these.

@wbnns

wbnns Feb 17, 2014

Contributor

Fixed.

@saivann saivann and 1 other commented on an outdated diff Feb 16, 2014

_templates/development.html
@@ -37,16 +37,7 @@
<h2>{% translate involve %}</h2>
{% case page.lang %}
-{% when 'es' %}
-<p>El desarrollo de Bitcoin es de código abierto y cualquier desarrollador puede contribuir al proyecto. Todo lo que necesitas está en el <a href="https://github.com/bitcoin/bitcoin">repositorio en Github</a>. Por favor, asegúrese de leer y seguir el proceso de desarrollo que se describe en el archivo README, así como proporcionar el código con buena calidad y respetar todas las directrices.</p>
-{% else %}
-<p>{% translate involvetxt1 %}</p>
-<p>{% translate involvetxt2 %}</p>
-<div id="chatbox" class="chatbox"></div>
@saivann

saivann Feb 16, 2014

Contributor

This content shouldn't be removed for all languages. Actually, since the only remaining outdated translation was Spanish in this case, you can also remove the {% case page.lang %} line. But line 43 to 45 are needed for all languages, including Spanish.

@wbnns

wbnns Feb 17, 2014

Contributor

I left {% case page.lang %} since it looked like {% when 'ar' or 'fa' %} rely on it. Added back 43 - 45.

Contributor

wbnns commented Feb 19, 2014

@saivann Ok, checked the checklist in Trello and also squashed. Please let me know if anything else! Thanks again for your help on this first one! :)

@saivann saivann commented on an outdated diff Feb 19, 2014

_templates/community.html
@@ -22,15 +22,10 @@
<li><strong>#bitcoin-otc</strong> {% translate chanotc %}</li>
<li><strong>#bitcoin-market</strong> {% translate chanmarket %}</li>
<li><strong>#bitcoin-mining</strong> {% translate chanmining %}</li>
- {% if page.lang == 'es' %}
- <li><strong>#bitcoin-ar</strong> (Comunidad Bitcoin Argentina)</li>
- <li><strong>#bitcoin-es</strong> (Comunidad Bitcoin en español)</li>
- <li><strong>#bitcoin-otc-ar</strong> (Mercado OTC de Bitcoin en Argentina)</li>
- {% endif %}
@saivann

saivann Feb 19, 2014

Contributor

Line 25 to 29: these Spanish IRC channels are useful for Spanish speakers, we could keep them.

@saivann saivann commented on an outdated diff Feb 19, 2014

_templates/development.html
@@ -37,16 +37,10 @@
<h2>{% translate involve %}</h2>
{% case page.lang %}
@saivann

saivann Feb 19, 2014

Contributor

{% case page.lang %} also needs to be removed here.

@saivann saivann commented on an outdated diff Feb 19, 2014

_templates/development.html
<p>{% translate involvetxt1 %}</p>
<p>{% translate involvetxt2 %}</p>
<div id="chatbox" class="chatbox"></div>
-{% endcase %}
-
-{% case page.lang %}
@saivann

saivann Feb 19, 2014

Contributor

{% case page.lang %} should be kept here (since it's followed by {% when 'ar'... %})

Contributor

saivann commented Feb 19, 2014

@gwd3 LGTM, thanks for taking all required steps.

saivann added a commit that referenced this pull request Feb 19, 2014

@saivann saivann merged commit 14e25c5 into bitcoin-dot-org:master Feb 19, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment