search

onomojo / i18n-timezones

Rails I18n timezone translations
MIT License
67 stars 47 forks source link

Added a locale. #8

Closed rorlab closed 10 years ago

rorlab commented 11 years ago

Hi, I have just added Japanese locale of i18n-timezones. ko.yml was translated into ja.yml using Google translation web service.

Thank you.

Hyoseong Choi, ROR Lab.

rorlab commented 11 years ago

I'm sorry but an error occurred on browing web page.

Psych::SyntaxError -
i18n_timezones/../../rails/locale/ja.yml): did not find expected key while parsing a block mapping at line 3 column 5
rorlab commented 11 years ago

Yes! All translation or encoding erros were removed. You may merge my pull-request.

Thank you.

Hyoseong Choi

onomojo commented 11 years ago

I apologize for the incredibly long delay in my response. Regarding this pull request, you should normally try to rebase your commits down to a single commit before you submit a pull request. This way when someone looks through the logs they can more easily see what changes were made, by who, and when. You have 10 commits here so if I merged it as is all those commits will go into the master branch and make it a bit hard to backtrack to find out what was actually changed. Here's my notes on rebasing to squish your commits into one before a pull request if you're interested:

To squish commits:

  1. git log
  2. count the number of YOUR commits from the head that you want to squish into one. Lets assume there are 15 commits from the head
  3. git rebase -i HEAD~15
  4. change the bottom 14 commits to squish (just change 'pick' to 's') and leave the top commit as pick
  5. Fix any conflicts as you would normally
  6. git add - NOTE: on this step never do a git commit -m ""... just a "git add"
  7. git rebase --continue
  8. if there are more conflicts, it will let you know again.. and you will be on step 5 to 8 again
  9. if you did 7 and there are no more conflicts. you have finished
  10. git push origin yourbranchname --force

After you're done rebasing, then you create a pull request. Since you already have this pull request open, after you finish step 10, it ought to just say 1 commit when you view the pull request.