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

Translation: Put single/double quotes around values in config/locales/controllers files #4751

Merged
merged 8 commits into from
Feb 14, 2019

Conversation

akshaygupta533
Copy link
Contributor

@akshaygupta533 akshaygupta533 commented Feb 3, 2019

Fixes #4729 #4702

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • PR is descriptively titled 📑
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@akshaygupta533
Copy link
Contributor Author

@gauravano

@grvsachdeva
Copy link
Member

Hi @akshaygupta533, thanks for the work. Have you compared the quotes for the entire file or just after the line 756 because there is no change before that in your commit.

I ran the PR locally and after running across Google searches, I found the error using YamlLint - https://github.com/adrienverge/yamllint. I am correcting the error.

Thanks!

@plotsbot
Copy link
Collaborator

plotsbot commented Feb 4, 2019

1 Message
📖 @akshaygupta533 Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.

Generated by 🚫 Danger

@akshaygupta533
Copy link
Contributor Author

@gauravano I just compared the strings in the controller files. If there's anything else to do, let me know.

@grvsachdeva
Copy link
Member

grvsachdeva commented Feb 4, 2019 via email

@grvsachdeva
Copy link
Member

Hi @akshaygupta533, is it possible for you to complete this PR by Monday as this combined file has to be tested and uploaded to Transifex too for the Translation & review process to begin? Also, you can update the status here like which folders from the original file structure you have compared, and I can complete the remaining folders. What do you say?

Also, thanks for great work on it till now!!

@grvsachdeva grvsachdeva added the Translation System issues which involve adding new translations, improving the translation system label Feb 8, 2019
@akshaygupta533
Copy link
Contributor Author

@gauravano Sorry for the late response. I was caught up with my mid term exams. I can complete this by tomorrow(11th Feb) afternoon.

@akshaygupta533 akshaygupta533 changed the title Translation: Put single/double quotes around values in locale files Translation: Put single/double quotes around values in config/locales/controllers files Feb 10, 2019
@grvsachdeva
Copy link
Member

grvsachdeva commented Feb 10, 2019 via email

@akshaygupta533
Copy link
Contributor Author

I'll do it. No worries, thanks:)

@akshaygupta533
Copy link
Contributor Author

@gauravano pls check

@grvsachdeva
Copy link
Member

grvsachdeva commented Feb 11, 2019

@akshaygupta533 I will take a look and solve the merge conflict too. Thanks for completing it even in-between your exams.

@grvsachdeva
Copy link
Member

Hi @jywarren, the PR I opened at #4716 which intends to combine YML files is merged in this one only and @akshaygupta533 and I have put quotes over the en translation values. I have also put double quotes at some places where it wasn't present before just to maintain the uniform syntax of the combined file.

Now, pushing this PR to unstable for final testing and then we can merge this. Thanks!

@grvsachdeva grvsachdeva mentioned this pull request Feb 14, 2019
@grvsachdeva
Copy link
Member

@jywarren please review this PR and you can test the changes at unstable too. Thanks!

@jywarren jywarren merged commit 8fcdb98 into publiclab:master Feb 14, 2019
@jywarren
Copy link
Member

Looks awesome everyone! Great work here. Thanks!!! 👍 👍 👍

@grvsachdeva
Copy link
Member

Thanks @jywarren! And, thanks @akshaygupta533 for working on this one 🎉 !

@grvsachdeva
Copy link
Member

@akshaygupta533 , thanks for nice work. We would love to have more help from you. If you are interested in solving more issues then check here - https://code.publiclab.org/#r=all for a new issue. In case, you are unable to find an issue, feel free to comment here. Thanks!

@akshaygupta533
Copy link
Contributor Author

akshaygupta533 commented Feb 14, 2019

@gauravano I would surely love to work on more issues. Meanwhile, if you find any issue suitable for me, please mention me. Thanks! 😄

SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
…/controllers files (publiclab#4751)

* English locales combined

* controller locales removed

* all en files deleted

* chinese files combined manually

* Translation: Put single/double quotes around values in locale files

* error removal by enclosing . in quotes

* corrections

* corrections + double quotes changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
review-me Translation System issues which involve adding new translations, improving the translation system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants