Tags: nuex/erlydtl
Tags
Merge branch 'master' into stable Conflicts: NEWS.md rebar.config src/erlydtl.app.src Resolved conflicts to keep master a development branch, with a clean NEWS file, while the stable branch has the full NEWS history and pinned dependencies and a hard coded version in the .app.src file.
Bring compile_dir up-to-date. Fixes erlydtl#121. Close erlydtl#122.
Revert "Replace our po scanner with the one used by zotonic." This reverts commit 1548261 for issue erlydtl#23. Conflicts: src/i18n/i18n_manager.erl The parsed formats differed, and I don't want to translate between them. Besides, it seems that it never was broken (or at least it works now) ((or the issue is/was something else)). 1> po_scanner:scan("23.po"). [{id,[]}, {str,"Project-Id-Version: Project\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2012-02-10 17:50+0100\nPO-Revision-Date: 2012-02-10 17:50+0100\nLast-Translator: Thomas Schaaf <schaaf@komola.de>\nLanguage-Team: komola UG <team@komola.de>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Poedit-KeywordsList: _;gettext;gettext_noop;_t\nX-Poedit-Basepath: .\nX-Poedit-Language: German\nX-Poedit-Country: GERMANY\nX-Poedit-SourceCharset: utf-8\nX-Poedit-SearchPath-0: .\n"}, {comment,": strings.php:2"}, {id,"PAGE_NOT_FOUND"}, {str,"Seite nicht gefunden!"}]
PreviousNext