xaviershay / enki

A Ruby on Rails blogging app for the fashionable developer. It's better than Mephisto or SimpleLog

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Merge master in internationalized?

novito opened this issue · comments

I am planning on adding i18n for Spanish but it seems the internationalized branch is a little bit outdated. Are you planning on merging master and internationalized to get the beautifulness of both?

Yes that is a great idea! I'd forgotten about the other branches :S Care to take a crack at it? Otherwise I'll try to get to it later in the week.

I will try to do it during the week yeah. I hope there are not many conflicts though, as I am completely new to the project. I should merge the branch to master or the other way around?

Other way around: merge master to internationalized.

I have done the merge. Working on Spanish i18n and I will be doing a pull request during the week :)

Done.