Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Added missing .pot files, translated hardcoded strings in modules and completed Spanish translation #3

Closed
wants to merge 5 commits into from

3 participants

@jcomellas

There are lost of little changes in this pull request. I've added sme .pot files that were not being generated. I also went over most of the strings in the modules and templates and translated in the same way I saw you were doing it in other places. I also fixed some English strings and completed the Spanish translation.

There are lots of changes here. Next time if you want I can make lots of small commits.

I've tested practically all of the translations on my local Zotonic installation.

@arjan
Owner

Thanks for the changes!

There's actually one thing that I don't like: the way the translations are done in the .erl files.
can you change that to the way it's being done in support/z_datetime.erl?

e.g. using the
?__(<<"some string here">>,Context)

construct.

and then putting the spanish translations of those english texts in a special .po file (since we dont can scan yet for these constructs). I would make that .po file per module and put it in e.g. modules/mod_admin/translations/es.erl.po for the strings coming from .erl files from mod_admin.

@arjan
Owner

Hi,

I actually fixed the .erl file scanning. All modules now get scanned for ?__("some string here",Context) constructs and those strings are put in translation files. So you can disregard the last paragraph from my last comment

@jcomellas

If I understand this correctly, the only thing I'd have to do is go over all the strings that need to be translated in the .erl files and change them to the ?__() format you specified before, right? Once this is done I'd have to regenerate all the .pot files and add the missing Spanish translations.

Is my interpretation of what you said OK?

@arjan
Owner

Yes, exactly like that :-)

@arjan
Owner

And we'll switch to git in a few weeks when I'm back from holiday, so that makes it easier in the future to do these pull requests :)

@arjan
Owner

We've switched to git now :-) Are you still working on this? Maybe you need to create a new branch.

@jcomellas

Yes, I'm still working on it, but I got sidetracked with "real work". I will create a new branch based on the master branch on github and recommit my changes. It will take me 2 o3 days to find time to finish this, though.

@mworrell
Owner

Hi,

How is it going? If you had any time then I would be more than happy to merge your changes.
(I know that time is sometimes hard to find, don't feel pressed :)

  • Marc
@jcomellas

Sorry, I've been swamped by Real Work. I think I'll have some time tomorrow and be able to finish the translations and integrate everything with HEAD.

@jcomellas jcomellas closed this
@jcomellas jcomellas reopened this
@mworrell
Owner

Thanks. Take care, it is better to do things good and slower than to push yourself too hard :)

@arjan
Owner

Closing this PR again... Not yet in a mergeable state.

@jcomellas feel free to reopen whenever you have it finished again.

@arjan arjan closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 12, 2011
  1. @jcomellas
  2. @jcomellas
  3. @jcomellas
  4. @jcomellas
Commits on Aug 13, 2011
  1. @jcomellas

    Add missing .pot files

    jcomellas authored
    Translate hardcoded strings in most of the Zotonic modules
    Complete Spanish translation
Something went wrong with that request. Please try again.