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

I18n sync HOC Down & Out 03/26 #21473

Merged
merged 83 commits into from
Mar 29, 2018
Merged

I18n sync HOC Down & Out 03/26 #21473

merged 83 commits into from
Mar 29, 2018

Conversation

Hamms
Copy link
Contributor

@Hamms Hamms commented Mar 26, 2018

No description provided.

@Hamms Hamms added the i18n label Mar 26, 2018
@@ -10,7 +10,7 @@ nav: how_to_nav
## 1. Prepárate para tu evento

- Elige lugar, fecha y hora.
- Envía [una carta](https://docs.google.com/a/code.org/document/d/1eP41sKW7y0qq_JvkRIgZK8dWYICaGRZ4CCDETXa78wY/edit) invitando al alcalde, diputado, presidente autonómico o empresario influyente para que de una charla. Consulta nuestras [herramientas prácticas](%=resolve_url('/files/elected-official.pdf')%) cuando alojes a un funcionario durante una hora de código para obtener más información.
- Send [a letter](https://hourofcode.com/promote/resources#sample-emails) to invite your local mayor, congressman, governor, or influential business person to speak. Check out our [how-to toolkit](%=localized_file('/files/elected-official.pdf')%) when hosting an elected official during an Hour of Code for more info.
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we lose the translation because we changed from resolve_url to localized_file?

@@ -5,7 +5,7 @@ nav: promote_nav
---
<%= view :signup_button %>

<% facebook = {:u=>"http://#{request.host}/es"}
<% facebook = {: u => "http://#{request.host}/ nos"}
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 this was translated when it shouldn't have been.

@@ -10,7 +10,7 @@ nav: promote_nav



Ir a [< % = resolve_url('code.org/promote') %>](%= resolve_url('https://code.org/promote') %) para encontrar información específica de estado sobre Ciencias de la computación.
Go to [code.org/promote](%= codeorg_url('/promote') %) to find state specific information about computer science.
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 looks like where we changed the function from resolve_url to codeorg_url it reset the translation. Any way we can keep these?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, maybe. If resolve_url still works, I could undo the parts of #21466 that included those changes, and sync them up again but with the update_without_changes option.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

does resolve_url still work? And if so, do you see any problems with that solution?

Copy link
Contributor

Choose a reason for hiding this comment

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

Brendan made these updates when he removed the redirects to xx.code.org partner sites. resolve_url still works, but it's now for hourofcode.com urls only. Then we use codeorg_url to preserve the environment.

So we definitely want all the strings to have codeorg_url instead of resolve_url so it looks like we would need to do special work to keep the translation. I don't think this is high priority enough to sidetrack other i18n work, so we may have to settle for asking for a re-translation.

@@ -160,6 +160,6 @@ nav: promote_nav

诚挚地,

[您的名字], [职位]
[Your Name], [Title]
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder why we'd lose the translation here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like we didn't lose it, it just got changed to this in crowdin: https://crowdin.com/translate/hour-of-code/612/en-zhcn#109293

Copy link
Contributor

Choose a reason for hiding this comment

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

Fun! Well not an error with sync, so this issue shouldn't block merging.

@Hamms Hamms merged commit 4ec9d88 into staging Mar 29, 2018
@Hamms Hamms deleted the i18n-sync-hoc-out-03-26 branch March 29, 2018 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants