-
Notifications
You must be signed in to change notification settings - Fork 260
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
Spanish #427
Spanish #427
Conversation
This landing text insn't used anymore (was on splash page), so we don't need to translate it.
Arr. I forgot to include the text_msg.yml translation. Committing asap. |
This is looking good. (Not to say I can read it so far as to understand it 100%, so we're still working on reviewing the actual translations! And sorry for the delay.) Just a small thing: There is a third commit here that adds English lines back into text_msg.yml: 6f209e6 If you can delete that and push again to your branch, that would be great. 👍 (Let us know if you want a hint as to how to do so.) |
Hi, thanks! Done. I found a revert option for the merge by searching online and it seems to have passed the checks.
I have asked around for reviewers. Perhaps, Antu said they will try to take a look if they have the time. I will continue to ask around in the meantime. |
I'll spend some time today looking for someone to review this. Thanks for sticking with it! |
Just as a heads-up: My work to update the remainder of the app's English phrases to be translatable seems to be almost done. That is Pull Request #421. When that merges into This project has involved a lot of shaking up of the app in order to get ready for translations. Sorry for the complications, and yes indeed, thank you for staying with it. |
Great! When that gets merged I'll pull it in and start translating them. From what I can see the text in those files is smaller bits of text distributed around perhaps, rather than large chunks of text. As far as I can tell, the most visible will be the front page, and the forms, buttons, nav etc. But will be mainly little bits of text here and there. So it shouldn't take long. Perhaps there, it's just getting the commits and things right. I know I can ask for help and you are all very helpful! We can do this! A couple of questions along the same lines of the upcoming translations, is about the name. I have left the name untranslated as it is seemed to me at the time it would be better for it to be site wide REFUGE and have a certain kind of brand recognition despite language differences (a bit like uber or whatever, which everyone knows what it stands for now in terms of the app, despite it being a german word), but it would be good to know if the consensus would be to have it translated into local language (in Spanish it is Refugio, so not too different, but not sure about other countries). I guess I thought if someone comes accross it in an article they would probably search for it in the name it is most well known for. But I'm not sure. If there's a big push to translate the name to a locally understandable one (I mean it's not too different), I'm happy to roll out those changes when the next set of translations come in through the #421 PR merge! |
This is an interesting question to me, too. I left the text "Refuge Restrooms" in the nav bar untraslatable, since I expected we wanted that unified naming and Proper Noun treatment, where it doesn't get translated. There are three ways I can think of to do it:
If I had to have an opinion on the matter, I would presume to not translate the name. |
Yes, I agree with having refuge as it is the “known name”, and whatever is decided I’m happy to add to the translations. |
Short answer: Go for it! Long answer (feel free to ignore if this info is not helpful!): Firstly, I think the files in #421 are mostly final. So I would say, go for it. (I still might get some comments on it asking for changes, but I feel like it's around 95% final, if not 100%.) You probably don't need or want the commits of PR #421 in this branch, so any way you get the files, I would recommend putting translated versions in As mentioned in an edit to one of my comments at some point (not surprised if no-one saw the edit!) I mentioned we probably won't have any merge conflicts (for Also, if Travis CI tests for this PR end up failing, that's fine. It wouldn't necessarily mean anything is wrong with this PR, and we could either ignore it or work around it if need be. There are other ways to confirm the files here are correct in that situation. |
If you do want to try the translations locally, I would suggest making a new branch off of upstream's [Edit: Or branch off of your You could then change this line in And then the page will show you the Spanish translations. (Assuming your web browser is configured to prefer the (I assume you would want to do this yourself for learning purposes. If not, I basically did the same thing here: https://github.com/DeeDeeG/refugerestrooms/tree/Spanish-plus-rebased-translation-ready) |
ahhh! Thank you @DeeDeeG, for all your detailed explanations, I will do all of that as soon as I can! |
Hi sorry about delays, I haven't disappeared, just had a lot of work over the last few days. I'm still on it! |
Hi again, Thank you for the update. (And no worries, we all get busy with outside things from time to time. Or more like all the time, heh, but yeah, we are all balancing a few things.) We'll be happy to see your contributions whenever you get the time. On another subject, @tkwidmer, @mi-wood, do you have some thoughts on how/whether to translate "REFUGE Restrooms"? I think we can do one of these three:
Thinking forward, this might have impact on brand names such as REFUGE Housing, for example. Do we translate "housing" there? Do we translate both words? Neither? (See this comment and the two subsequent comments for discussion so far.) |
Hi @DeeDeeG thanks for understanding! To save time I cloned your translation ready branch into my local repo. I want to merge your changes into my |
Hi. There is a simple answer to this, which is: I think merging the latest upstream
Yeah, I agree that
Great! 🎉
Awesome.
Yeah, pretty much. 👍 In principle that all makes sense. But there is a new piece of information you might wish to have before proceeding that way.
Well, here's the thing. The PR #421 just got merged into upstream I made a big explainer post about merges below; I do hope it will be helpful without taking overly long to read through. (Much of it isn't relevant to this PR, since you probably won't run into merge conflicts; A lot of the post below is about merge conflicts.) |
I hope this explanation of merges will be helpful! Where commits end up when you mergeMerging on the command line merges all branches you type after " Working on branch
Results in: Working on branch
Results in: You get, at minimum, every commit from both/all the branches involved in the merge, submitted into the target branch (which is always the current branch). (You may also get a "merge commit" in the target branch, depending on the complexity of the merge.) Merging any two branches in either direction (merging Under-the-hood details about merges(Stuff that Git does to resolve a merge)Git usually picks a merge strategy for you when you do a Fast-Forward merge strategy (So simple, this arguably isn't a "true merge")The simplest is a fast-forward. Say you are on one branch *(identical other than having two different branch names, (Fun fact: This style of "merge" happens when you run Every other merge strategyThe rest of the strategies are just variations on a theme: Any of them tries to figure out what actually differs between the branches, and tries to put all the commits from the source branch(es) into the target branch, and fails if anything too crazy happens to any particular file during the merge. Simple merges with no conflicts (no-fast-forward)Say you are on Merges with conflictsMaybe you branched
Fixing merge conflictsAt that point, you may see something like this in
That means there are three versions of that one line of the file (
Git expects you to go in and edit the files (by hand) that have conflicts, then once you're done fixing the files up, I personally find all the I usually click SummaryMerging is (sort of?) a simple process, unless there there are merge conflicts. If you know how to resolve merge conflicts, even complicated merges are possible. It's not very intuitive at first, but hopefully makes sense eventually. P.S.: I recommend taking another look at this section of Think-Like-(a)-Git if you want a more step-by-step, hands-on lesson: http://think-like-a-git.net/sections/testing-out-merges.html P.P.S.: Similar to Atom, there is GitHub Desktop. GitHub Desktop probably helps you resolve merge conflicts just as well as Atom, but I haven't used it much. They don't make a version of it for Linux. 🤷 [Edit: GitHub Desktop doesn't help resolve merge conflicts, from what I can tell. Can't confirm without a machine to test it on; I might try it on Windows soon. For now, Atom is the best way I know to fix merge conflicts.] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hola, la pagina de Refuge en Twitter me mandó a colaborar en la traducción y francamente si veo muchos detalles pequeños en la traducción, sobretodo en la terminología LGBTQIA y uno que otro detalle en las tildes. Un ejemplo es que no es intersex, sino intersexo o intersexuado y en la traducción de gender noncomforming debería de ser de género no conforme.
For the record, the tweet @jojoalienigena is referring to is this tweet here: For our English speaking maintainers... This is the comment above, rendered into English with Google Translate, then filtered through my attempts to improve over Google Translate's translation (see [brackets] for my edits)...
Sorry I am not fluent in Spanish. I will post a version of my comment translated with Google Translate below. [Edit: Whoops, wrong twitter link! Fixed.] Para que todos lo sepan, el tweet @jojoalienigena se refiere a este tweet aquí: Para nuestros mantenedores de habla inglesa ... Este es el comentario anterior, traducido al inglés con Google Translate, luego filtrado a través de mis intentos de mejorar la traducción de Google Translate (ver [corchetes] para mis ediciones) ...
Lo siento, no soy fluido en español. Esta es una versión de mi comentario (escrito en inglés) traducido con Google Translate. [Edición: ¡Ups! Enlace incorrecto de twitter. Arreglado.] |
Hey! great! It would be fantastic to get your corrections @jojoalienigena. Realmente sería genial tener tus aportes, gracias! |
Also, there are some previous corrections which addressed the missing tildes! The previous corrections are in #430 and are really great & worth checking out! Maybe we can incorporate intersexo and genero no conforme into the changes made in that PR? Are there are other issues with terminology you see? |
config/locales/es/landing.es.yml
Outdated
@@ -0,0 +1,3 @@ | |||
es: | |||
landing: | |||
development: "Este sitio actualmente está en funcionamiento. Sin embargo, está en desarrollo. Puede que encuentre problemas técnicos (bugs). En ese caso, por favor cree un "issue" en %{github_link}, o envienos un %{contact_link} para poder resolverlo lo antes posible. Este proyecto es de código abierto. Te alentamos a contribuir en %{github_link}." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the internal double quotes are throwing off the test. Those need to be escaped.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm glad to know what was causing these errors.
BTW I don't think we use these strings anymore, so the file can just be deleted. I already deleted it in locales/en
, so I think we probably want it deleted here, too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can use single quotes ('
) wrapping the outside of the whole translation, then use double quotes ("
) within the translation string.
By the way, I asked around, and it seems like we are leaning pretty strongly toward not translating the phrase "REFUGE Restrooms", treating it as the shared brand name across localizations/translations. |
Now that this has seen comment/review from two other people who are fluent in Spanish, I'm pretty confident it's a fine translation. If there are any more improvements that can be made, that no-one noticed yet, those improvements can still be made if/as needed, on an ongoing basis. In any case, I think it's nicer to get this out to the users, rather than spending more time trying to make this PR perfect. Nothing in the app is at the level of perfection anyway; it's just at the level of "the best we can do." Thanks again for your work here. I think it will mean a lot to Spanish readers/speakers who want to use the site. (Not sure if this translates the iOS/Android apps too, but I think that would have to be done separately if we want to do that? cc @hkellaway, @hissingpanda) I looked through the commits here and made a simplified version of this branch, here: develop...DeeDeeG:simplified-Spanish I think making the Git commit history look something like that would be the best way to structure this PR's commits before merging. (I can handle such details, if you like, or can let you handle it. Whatever works is fine. Ultimately, the important thing is getting the finished translation available to users, IMO.) Let us know if you need anything, or have any questions/comments/updates about stuff. |
This would only translate viewing the web from IOS. The iOS app is its own beast with native code. Although at some point it might be worth build a react app, that can serve react native and the web. |
It looks like the build is failing though. |
It's the thing @mi-wood mentioned in the code review/comment thingy. Travis log line 1337 has the full error:
We can either fix the quote styles, or else just delete the file, like we did in the English ( |
I'm cool with going ahead and removing that file and merging this |
Just for the record, I don't think @jojoalienigena's comments were
addressed yet, since there was some attempt at ongoing dialog. But we
haven't heard back so far, so I don't think we're going to.
I think it would be easy to do a simple PR addressing that comment after
this is merged, if needed.
|
Hi! Please can we wait until the weekend to merge so I can address a bunch of the things. I want to
|
@Intimaria thank you for translating all the new files! |
Hi, @DeeDeeG! I'm glad to! |
This is deployed at https://refuge-staging-14.herokuapp.com/about I set my browser language to Spanish, but still can't see the translation. Can someone else check this and see it I just haven't set it right? |
about: | ||
title: 'Acerca de REFUGE' | ||
p1header: '¿De qué se trata REFUGE restrooms?' | ||
p1: 'REFUGE es una aplicación por internet que busca proveer acceso seguro a baños para personas trans, intersexo, y personas género no conformes. Cuando el sitio web Safe2Pee cesó de funcionar, dejó un vacio en nuestros corazones. REFUGE continúa el proyecto de Safe2Pee y vuelve a poner a disposición ese recurso valorado para quienes necesitan un espacio seguro para usar el baño. Es posible buscar baños por proximidad a una ubicación, agregar nuevos sanitarios a la lista, además de comentar y agregar un puntaje a los baños listados. Queremos crear una comunidad enfocada en más que solo buscar baños seguros, que sientan que pueden proyectar y participar en crear espacios para apoyar a personas trans, intersexo y personas género no conformes.' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the about page might have changed from when this PR was originally created. This now has multiple sections and is displaying English since it doesn't match: https://github.com/RefugeRestrooms/refugerestrooms/blob/develop/config/locales/en/about.en.yml#L6
@DeeDeeG @Intimaria did either of you look at translating forms? It looks like they're still coming up in English for me. I'm getting too tired to look, but I imagine simple form is inferring it from variables |
Thanks @mi-wood, you're right!
|
I would recommend we add all the Note: Full thoughts/details below: I think the Good news: the Rails i18n API is aware of those strings. To check out the strings, install the gem I meant to test this at some point, since I knew it "just worked" in English, and was hoping they had the fore-thought to translate to other languages. Now that we know need these strings manually translated, how should we make that clear in our files? Should we add all the strings to our Other option: Only add the remaining, "missing" translation strings for Benefit for doing it in the |
@Intimaria thanks! the @DeeDeeG I'll start adding the defaults to the english file and we can go from there |
I've created #446 for the labels. @Intimaria Can you either make a pull request or paste here with translations for those? I can update it and get this rolling! |
@mi-wood Whoops! Yes, here is the first bit:
Small ask: Forms:
Submit would be |
Otherwise, @Intimaria, if you do want to submit this as a new Pull Request, I recommend this workflow:
[Edit]: Alternatively, I found a way to fake commit as another person, which even just mentioning is a bit like opening Pandora's box, and doing so would not generally be a good idea IMO, but it would be a way to give credit for these translations! (And it would be strange to fake a commit author, so... Not planning to do that, and if I get feedback that it sounds like a bad idea that would be another reason to not do it. Just mentioning, because it is indeed possible.) |
All set and deployed!! Thanks so much to everyone who helped make this happen, especially @Intimaria! This is really awesome work. |
Happy to tag anyone in this if they want: https://twitter.com/REFUGErestrooms/status/961043500488826881 |
Hi! My twitter is locked but you can add it if you like @animoveronica. Edit: PS this is all very exciting. Do you know if it rolls out to the apps automatically or should we think through how it can be done? |
It does not roll out to the apps automatically. Well, they borrow the "submit a new restroom" page of the website. So it may work automatically on just that part of the apps. Fortunately, there is a lot less text to translate in the mobile apps than the web app, as far as I can tell. I don't personally have much experience with programming mobile apps, and I know the process there is likely to be a bit different, but it would be good to open an issue at those repos and get the discussion going for how to translate the apps:
P.S. See this existing issue for translating the iOS app: RefugeRestrooms/refugerestrooms-ios#116 |
* config/locales: Delete unused "landing" file This landing text insn't used anymore (was on splash page), so we don't need to translate it. * Spanish translation
* config/locales: Delete unused "landing" file This landing text insn't used anymore (was on splash page), so we don't need to translate it. * Spanish translation
Context
Summary of Changes
es
folder with translationsChecklist