Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i18n: integration with Angular templates #40

Merged
merged 3 commits into from
Oct 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ coverage.xml

# Translations
*.mo
*.pot

# Django stuff:
*.log
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ python:
- "pypy"

matrix:
fast_finish: true
allow_failures:
- python: pypy

Expand Down
10 changes: 8 additions & 2 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of Invenio.
# Copyright (C) 2015 CERN.
# Copyright (C) 2015, 2016 CERN.
#
# Invenio is free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public License as
Expand All @@ -23,7 +23,7 @@
# as an Intergovernmental Organization or submit itself to any jurisdiction.


# TODO: Transifex integration
# Transifex integration
#
# 1) Create message catalog:
# $ python setup.py extract_messages
Expand All @@ -48,3 +48,9 @@ file_filter = invenio_search_ui/translations/<lang>/LC_MESSAGES/messages.po
source_file = invenio_search_ui/translations/messages.pot
source_lang = en
type = PO

[invenio.invenio-search-ui-messages-js]
file_filter = invenio_search_ui/translations/<lang>/LC_MESSAGES/messages-js.po
source_file = invenio_search_ui/translations/messages-js.pot
source_lang = en
type = PO
27 changes: 13 additions & 14 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,33 @@
# waive the privileges and immunities granted to it by virtue of its status
# as an Intergovernmental Organization or submit itself to any jurisdiction.

# Check manifest will not automatically add these two files:
include .dockerignore
include .editorconfig
include .tx/config
recursive-include invenio_search_ui *.js
recursive-include invenio_search_ui *.mo
recursive-include invenio_search_ui *.po
recursive-include invenio_search_ui *.pot
recursive-include invenio_search_ui *.scss

# added by check_manifest.py
include *.rst
include *.sh
include *.txt
include .dockerignore
include .editorconfig
include .lgtm
include .tx/config
include LICENSE
include MAINTAINERS
include babel-js.ini
include babel.ini
include docs/requirements.txt
include pytest.ini
include examples/requirements.txt
recursive-include examples *.sh
include pytest.ini
recursive-include docs *.bat
recursive-include docs *.py
recursive-include docs *.rst
recursive-include docs Makefile
recursive-include examples/data *.json
recursive-include examples *.py
recursive-include examples *.sh
recursive-include examples *.xml
recursive-include examples/data *.json
recursive-include invenio_search_ui *.html
recursive-include invenio_search_ui *.js
recursive-include invenio_search_ui *.mo
recursive-include invenio_search_ui *.po
recursive-include invenio_search_ui *.pot
recursive-include invenio_search_ui *.scss
recursive-include tests *.py
prune examples/static/node_modules
25 changes: 25 additions & 0 deletions babel-js.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
#
# This file is part of Invenio.
# Copyright (C) 2016 CERN.
#
# Invenio is free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# Invenio is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Invenio; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307, USA.
#
# In applying this license, CERN does not
# waive the privileges and immunities granted to it by virtue of its status
# as an Intergovernmental Organization or submit itself to any jurisdiction.

[angular_gettext: **/static/templates/**/**.html]
23 changes: 22 additions & 1 deletion invenio_search_ui/bundles.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@

"""UI for Invenio-Search."""

import os

from flask_assets import Bundle
from invenio_assets import NpmBundle
from invenio_assets import AngularGettextFilter, GlobBundle, NpmBundle
from pkg_resources import resource_filename

css = Bundle(
Bundle(
Expand All @@ -39,6 +42,24 @@
output='gen/search.%(version)s.css'
)


def catalog(domain):
"""Return glob matching path to tranlated messages for a given domain."""
return os.path.join(
resource_filename('invenio_search_ui', 'translations'),
'*', # language code
'LC_MESSAGES',
'{0}.po'.format(domain),
)


i18n = GlobBundle(
catalog('messages-js'),
filters=AngularGettextFilter(catalog_name='invenioSearchUITranslation'),
output='gen/translations/invenio-search-ui.js',
)


js = NpmBundle(
'js/invenio_search_ui/app.js',
filters='requirejs',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-show='vm.invenioSearchError.name'>
<div class="alert alert-danger">
<i class="fa fa-bolt"></i> <strong>Error:</strong> {{ vm.invenioSearchErrorResults.message }}
<i class="fa fa-bolt"></i> <strong translate>Error:</strong> {{ vm.invenioSearchErrorResults.message }}
</div>
</div>
24 changes: 24 additions & 0 deletions invenio_search_ui/translations/af/LC_MESSAGES/messages-js.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: invenio\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:32+0200\n"
"PO-Revision-Date: 2016-10-20 07:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Afrikaans (http://www.transifex.com/inveniosoftware/invenio/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/static/templates/invenio_search_ui/error.html:3
msgid "Error:"
msgstr ""
25 changes: 25 additions & 0 deletions invenio_search_ui/translations/af/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: invenio-search-ui 1.0.0a6.dev20160628\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Afrikaans (https://www.transifex.com/inveniosoftware/teams/23537/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/templates/invenio_search_ui/base_header.html:27
#: invenio_search_ui/templates/invenio_search_ui/header.html:29
msgid "Search"
msgstr ""
24 changes: 24 additions & 0 deletions invenio_search_ui/translations/bg/LC_MESSAGES/messages-js.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: invenio\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:32+0200\n"
"PO-Revision-Date: 2016-10-20 07:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Bulgarian (http://www.transifex.com/inveniosoftware/invenio/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/static/templates/invenio_search_ui/error.html:3
msgid "Error:"
msgstr ""
26 changes: 26 additions & 0 deletions invenio_search_ui/translations/bg/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: invenio-search-ui 1.0.0a6.dev20160628\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Tibor Simko <tibor.simko@cern.ch>, 2016\n"
"Language-Team: Bulgarian (https://www.transifex.com/inveniosoftware/teams/23537/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/templates/invenio_search_ui/base_header.html:27
#: invenio_search_ui/templates/invenio_search_ui/header.html:29
msgid "Search"
msgstr "Търсене"
24 changes: 24 additions & 0 deletions invenio_search_ui/translations/ca/LC_MESSAGES/messages-js.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: invenio\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:32+0200\n"
"PO-Revision-Date: 2016-10-20 07:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Catalan (http://www.transifex.com/inveniosoftware/invenio/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/static/templates/invenio_search_ui/error.html:3
msgid "Error:"
msgstr ""
26 changes: 26 additions & 0 deletions invenio_search_ui/translations/ca/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: invenio-search-ui 1.0.0a6.dev20160628\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Tibor Simko <tibor.simko@cern.ch>, 2016\n"
"Language-Team: Catalan (https://www.transifex.com/inveniosoftware/teams/23537/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/templates/invenio_search_ui/base_header.html:27
#: invenio_search_ui/templates/invenio_search_ui/header.html:29
msgid "Search"
msgstr "Cerca"
24 changes: 24 additions & 0 deletions invenio_search_ui/translations/cs/LC_MESSAGES/messages-js.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: invenio\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:32+0200\n"
"PO-Revision-Date: 2016-10-20 07:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Czech (http://www.transifex.com/inveniosoftware/invenio/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

#: invenio_search_ui/static/templates/invenio_search_ui/error.html:3
msgid "Error:"
msgstr ""
2 changes: 1 addition & 1 deletion invenio_search_ui/translations/cs/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: invenio-search-ui 1.0.0a6.dev20160628\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-08-19 15:06+0200\n"
"POT-Creation-Date: 2016-10-12 15:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Jiří Kunčar <jiri.kuncar@gmail.com>, 2016\n"
"Language-Team: Czech (https://www.transifex.com/inveniosoftware/teams/23537/cs/)\n"
Expand Down
24 changes: 24 additions & 0 deletions invenio_search_ui/translations/da/LC_MESSAGES/messages-js.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Translations template for invenio-search-ui.
# Copyright (C) 2016 CERN
# This file is distributed under the same license as the invenio-search-ui
# project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: invenio\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-10-12 15:32+0200\n"
"PO-Revision-Date: 2016-10-20 07:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Danish (http://www.transifex.com/inveniosoftware/invenio/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: invenio_search_ui/static/templates/invenio_search_ui/error.html:3
msgid "Error:"
msgstr ""
2 changes: 1 addition & 1 deletion invenio_search_ui/translations/da/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: invenio-search-ui 1.0.0a6.dev20160628\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
"POT-Creation-Date: 2016-08-19 15:06+0200\n"
"POT-Creation-Date: 2016-10-12 15:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Danish (https://www.transifex.com/inveniosoftware/teams/23537/da/)\n"
"MIME-Version: 1.0\n"
Expand Down
Loading