Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Chinese, German and Spanish translations #202

Merged
merged 6 commits into from
Aug 8, 2019
Merged

Add Chinese, German and Spanish translations #202

merged 6 commits into from
Aug 8, 2019

Conversation

huey735
Copy link
Contributor

@huey735 huey735 commented Aug 7, 2019

I translated the images in the DAO page and renamed the image files accordingly.

huey735 added 2 commits August 7, 2019 00:12
Fix typos and remove unnecessary strings from
the translation files
Copy link
Contributor

@m52go m52go left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me...couple of minor things and it's ready to go.

@@ -733,7 +733,7 @@
<body class="home page-template-default page page-id-6 custom-background">

<!--Select includes/main_nav according to page lang or absence of lang-->
{% if page.lang == "pt-PT" %}
{% if page.lang == "de" or page.lang == "es" or page.lang == "pt-PT" or page.lang == "zh-CN" %}
Copy link
Contributor

@m52go m52go Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid adding languages to the condition every time...with lots of languages, this will quickly get unwieldy.

How about this?

{% if page.lang == "en" %}
    {% include main_nav.html %}
{% else %}
    {% include main_nav_tr.html %}
{% endif %}

Copy link
Contributor Author

@huey735 huey735 Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reworked it to look like this:

          {% if page.lang == "en" or page.ref == "blog" %}
            {% include main_nav.html %}
          {% else %}
            {% include main_nav_tr.html %}
          {% endif %}

Otherwise the Blog page doesn't render a nav bar.

_data/es.yml Outdated
pJoin: >
<p>Bisq siempre está buscando desarrolladores altamente cualificados, diseñadores y expertos en seguridad para unirse a nuestra <a href="localhost:4001/community/">comunidad</a>. Si está interesado en ayudar a mejorar Bisq, hay muchas maneras de<a href="https://docs.bisq.network/contributor-checklist.html" target="_blank" rel="noopener">contribuir</a>.
Nos encantaría<a href="localhost:4001/community/">saber de ti</a>!</p>
<p>Nuestra <a href="localhost:4001/roadmap/">hoja de ruta</a> proporciona una vista general de las características y hitos hasta llegar a la v.1.0. de Bisq</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the period at the end of the sentence is misplaced:

hasta llegar a la v.1.0 de Bisq.

_data/es.yml Outdated
<li class="mt-0 mb-4 pb-4 border-bottom step step-text-2" data-image="step-image-2">Añada sus cuentas de moneda nacional o cripto</li> <li class="mt-0 mb-4 pb-4 border-bottom step step-text-3" data-image="step-image-3">Cree una nueva oferta o tome una existente.</li> <li class="mt-0 step step-text-4" data-image="step-image-4">Siga la interfaz de usuario para finalizar el intercambio.</li>
hJoin: Unirse a la comunidad
pJoin: >
<p>Bisq siempre está buscando desarrolladores altamente cualificados, diseñadores y expertos en seguridad para unirse a nuestra <a href="localhost:4001/community/">comunidad</a>. Si está interesado en ayudar a mejorar Bisq, hay muchas maneras de<a href="https://docs.bisq.network/contributor-checklist.html" target="_blank" rel="noopener">contribuir</a>.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know the language but it seems like there are missing spaces around the links here.

Notice "maneras decontribuir" and "Nos encantaríasaber de ti".

Screenshot from 2019-08-08 00-28-38

seeMore: >
<p>Weitere Ressourcen finden Sie in unserem <a href='https://docs.bisq.network/dao.html'>Alles über die Bisq DAO</a> Dokument.</p> <p>Bisherige Mitwirkende finden in <a href='https://docs.bisq.network/compensation.html#get-added-to-genesis'>diesem Link</a> Anweisungen, wie sie der Genesis BSQ-Distribution hinzugefügt werden können.</p>
downloads:
hBisqDownloads: Bisq Downloads
Copy link
Contributor

@m52go m52go Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runningWindows
runningMac
runnigDebian
runningRedHat

Need to remove the periods here, otherwise, they result in a double period. Also check pt-PT.yml. I think the others are fine.

The runningOS keys in the homepage_content section can have periods, but the runningOS keys in the downloads section shouldn't.

If you want to keep it simple you could just remove periods from all runningOS keys...the homepage_content doesn't really need periods anyway.

Copy link
Contributor Author

@huey735 huey735 Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you show me where the strings for the "running" keys appear on the website? I guess it isn't detecting on my computer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it's on the Downloads page at the end of the sentence where it says "You appear to be using..."

This is ok, no double period:

Screenshot from 2019-08-08 04-21-24

This has a double period:

Screenshot from 2019-08-08 04-20-05

Only a problem for de and pt-pt though...you won't see it for any other language.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, thanks. Chrome doesn't display it for some reason here, but it does show up on Firefox.

huey735 added 3 commits August 8, 2019 09:17
I reworked the Liquid control flow tags to include the nav bar.
Now, pages where "lang: en" or "ref: blog" will include
the English nav bar while everywhere else will include a nav
bar according to its language.
_data/es.yml Outdated Show resolved Hide resolved
Co-Authored-By: Steve Jain <[email protected]>
@m52go
Copy link
Contributor

m52go commented Aug 8, 2019

ACK

@m52go m52go merged commit fcab93c into bisq-network:master Aug 8, 2019
@huey735 huey735 deleted the addtranslations branch August 8, 2019 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants