diff --git a/README.md b/README.md index 4159ead..4ac5ff3 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ __Generate translations__ python ../manage.py compilemessages # Under docker shell, run -docker-compose -f docker-compose.yml exec web python manage.py compilemessages group +docker-compose -f docker-compose.yml exec web python manage.py compilemessages ``` __Load default groups__ diff --git a/app/Dockerfile b/app/Dockerfile index 7d4392c..b0c82a0 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -17,7 +17,7 @@ RUN apk update \ libxml2-dev \ libxslt-dev \ libffi-dev \ - gettext + gettext-dev RUN pip install --upgrade pip @@ -43,6 +43,8 @@ WORKDIR ${APP_HOME} COPY . ${APP_HOME} +RUN django-admin compilemessages + RUN chown -R app:app ${APP_HOME} USER app diff --git a/app/core/locale/es/LC_MESSAGES/django.po b/app/core/locale/es/LC_MESSAGES/django.po index 9c9a373..66d5837 100644 --- a/app/core/locale/es/LC_MESSAGES/django.po +++ b/app/core/locale/es/LC_MESSAGES/django.po @@ -193,7 +193,7 @@ msgstr "Edite assets y renditions del artículo" #: templates/index.html:56 msgid "Edit article metadata" -msgstr "Edite metadata del artículo" +msgstr "Edite metadatos del artículo" #: templates/index.html:57 msgid "Find problems" @@ -556,26 +556,3 @@ msgstr "Se agregó el paquete (%(name)s, %(id)s)" #: views.py:239 msgid " does not have a valid format. Please provide a zip file." msgstr " no tiene un formato válido. Por favor, proporcione un archivo zip." - -#~ msgid "Reset password" -#~ msgstr "Restablecer la contraseña" - -#~ msgid "Send e-mail" -#~ msgstr "Enviar correo electrónico" - -#, fuzzy -#~| msgid "Packages" -#~ msgid "Package address" -#~ msgstr "Direción del paquete" - -#~ msgid "No packages were found for document %s" -#~ msgstr "No se encontraron paquetes para el documento %s" - -#~ msgid "Activities" -#~ msgstr "Actividades" - -#~ msgid "All activities" -#~ msgstr "Todas las actividades" - -#~ msgid "The two password fields didn’t match." -#~ msgstr "Los dos campos de contraseña no coincidían." diff --git a/app/core/locale/pt/LC_MESSAGES/django.po b/app/core/locale/pt/LC_MESSAGES/django.po index 837e857..94de6a9 100644 --- a/app/core/locale/pt/LC_MESSAGES/django.po +++ b/app/core/locale/pt/LC_MESSAGES/django.po @@ -189,11 +189,11 @@ msgstr "Agendar artigo para publicação" #: templates/index.html:55 msgid "Edit article assets and renditions" -msgstr "Edite assets y renditions" +msgstr "Edite assets e renditions" #: templates/index.html:56 msgid "Edit article metadata" -msgstr "Edite metadata del artículo" +msgstr "Edite metadados do artigo" #: templates/index.html:57 msgid "Find problems" @@ -557,24 +557,3 @@ msgstr "Pacote (%(name)s, %(id)s) foi adicionado" msgid " does not have a valid format. Please provide a zip file." msgstr "" " não possui um formato válido. Por favor, forneça um arquivo em formato zip." - -msgid "Reset password" -#~ msgstr "Redefinir senha" - -#~ msgid "Send e-mail" -#~ msgstr "Enviar e-mail" - -#~ msgid "Package address" -#~ msgstr "Endereço do pacote" - -#~ msgid "No packages were found for document %s" -#~ msgstr "Não foram encontrados pacotes para o documento %s" - -#~ msgid "Activities" -#~ msgstr "Atividades" - -#~ msgid "All activities" -#~ msgstr "Todas as atividades" - -#~ msgid "The two password fields didn’t match." -#~ msgstr "As duas senhas são diferentes." diff --git a/app/core/templates/index.html b/app/core/templates/index.html index 69d4773..31bc3dc 100644 --- a/app/core/templates/index.html +++ b/app/core/templates/index.html @@ -84,7 +84,7 @@

{% trans 'Home' %}

{% trans 'All deposited packages' %} - {% trans "Articles' files" %} + {% trans "Articles' files" %}
diff --git a/app/core/templates/ingress/article_files_list.html b/app/core/templates/ingress/article_files_list.html deleted file mode 100644 index 4a9f84b..0000000 --- a/app/core/templates/ingress/article_files_list.html +++ /dev/null @@ -1,79 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block title %} -SciELO Publishing Framework - {% trans "Articles' files" %} -{% endblock %} - -{% block content %} -

{% trans "Articles' files" %}

- -
- {% if article_files_obj %} -
- - - - - - - - - - - - - - - {% for art in article_files_obj %} - - - - - {% if art.created != art.updated %} - - {% else %} - - {% endif %} - - - - - - {% endfor %} - -
#{% trans 'Identifier' %}{% trans 'Creation date' %}{% trans 'Update date' %}{% trans 'Package name' %}{% trans 'XML' %}{% trans 'Assets' %}{% trans 'Renditions' %}
{{ article_files_obj.start_index|add:forloop.counter0 }}{{ art.id }}{{ art.created|date:'Y-m-d H:i' }}{{ art.updated|date:'Y-m-d H:i' }}{{ art.file.name }}{{ art.xml }}{{ art.assets|length }}{{ art.renditions|length }}
-
- {% endif %} -
- -{% if article_files_obj %} - -{% endif %} - -{% endblock %} \ No newline at end of file diff --git a/app/core/urls.py b/app/core/urls.py index a44d35c..d054051 100644 --- a/app/core/urls.py +++ b/app/core/urls.py @@ -22,7 +22,6 @@ path('ingress/package_upload/', views.ingress_package_upload_page, name='ingress_package_upload'), path('ingress/package_download/', views.ingress_package_download_page, name='ingress_package_download'), path('ingress/package_list/', views.ingress_package_list_page, name='ingress_package_list'), - path('ingress/articles_files/', views.ingress_articles_files_page, name='ingress_article_files_list'), ] journal = [ diff --git a/app/core/views.py b/app/core/views.py index 83c84af..a386aee 100644 --- a/app/core/views.py +++ b/app/core/views.py @@ -288,18 +288,6 @@ def ingress_package_list_page(request): return render(request, 'ingress/package_list.html', context={'deposited_package_obj': deposited_package_obj, 'scope': request_scope}) -@login_required(login_url='login') -@allowed_users(allowed_groups=['manager', 'operator_ingress']) -def ingress_articles_files_page(request): - article_files_list = dsm_ingress._docs_manager.get_articles_files() - - paginator = Paginator(article_files_list, 25) - page_number = request.GET.get('page') - article_files_obj = paginator.get_page(page_number) - - return render(request, 'ingress/article_files_list.html', context={'article_files_obj': article_files_obj}) - - ################# # journal views # ################# diff --git a/app/requirements.txt b/app/requirements.txt index d398558..95b2479 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -10,6 +10,6 @@ sqlparse==0.4.1 lxml==4.6.3 minio==7.1.0 gunicorn==20.1.0 --e git+https://github.com/scieloorg/opac_schema.git#egg=opac_schema --e git+https://github.com/scieloorg/dsm.git#egg=dsm --e git+https://github.com/scieloorg/scielo_v3_manager.git#egg=scielo_v3_manager +-e git+https://github.com/scieloorg/opac_schema.git@v2.62#egg=opac_schema +-e git+https://github.com/scieloorg/dsm.git@v0.1#egg=dsm +-e git+https://github.com/scieloorg/scielo_v3_manager.git@0.6#egg=scielo_v3_manager diff --git a/app/setup.py b/app/setup.py index ca20cd1..cc0789d 100644 --- a/app/setup.py +++ b/app/setup.py @@ -23,7 +23,7 @@ setuptools.setup( name="SciELO Publishing Framework", - version="0.1", + version="0.1.4.4", author="SciELO", author_email="scielo-dev@googlegroups.com", description="This is the SciELO Upload Framework",