Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

Conversation

@coryduclos
Copy link

Hello!

I've corrected and added to the Spanish language support in the config/locales/devise.es.yml and config/locales/es.yml. Corrections include grammar and orthography and additions include translations of untranslated segments.

I've made some other changes to other files for my own, personal use that should be ignored. I'm not sure (if it is even possible) how to submit changes to select files. If this is possible, please let me know.

Hasta luego,
Cory

@jeremyboggs
Copy link
Member

Thanks for submitting this. The Prism team will review this soon and give you an update.

@waynegraham
Copy link

Hi Cory,

First, thanks for contributing these fixes back! I was just looking over this and there are a few things we won't be able to use in the pull request as this is the repository that we deploy the application from. Specifically these changes:

b1f1289 (adds your name to the footer) and removes some of the main page elements
7babfba (removes most of the data the main site uses for the application)
091236b (removes main navigation elements)
...

After looking at these, it appears as there are only a few changes to Spanish translations that need to be made. What we need you to do is rebase the repo off of our master branch, then create a new feature branch (e.g. update_spanish_translations) and do a squash merge with these updates in them. It'll look something like this:

git remote add prism git://github.com/scholarslab/prism.git
git checkout update_spanish_translation
git rebase master

For more information on this, you can see the documentation at http://git-scm.com/book/ch3-6.html for rebasing. You may also need to "fix" things on the branch by undoing some of the commits (see http://git-scm.com/book/en/Git-Basics-Undoing-Things) and for the squash merge (so we only see on commit here), check out https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one.

Once you push back to github, this ticket will update and we can take a look...

Wayne

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants