openstack/horizon
Code Issues Proposed changes

Merge "Fix pofile for pseudo translations"

Browse Source
This commit is contained in:
Jenkins 2017-08-21 10:10:02 +00:00 committed by Gerrit Code Review
commit c8c31e9f54
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/templates/horizon/common/_data_table_pagination.html
View File

@ -1,7 +1,7 @@
{% load i18n %}
<tr>
<td colspan="{{ columns|length }}">
<span class="table_count">{% blocktrans count counter=rows|length %}
<span class="table_count">{% blocktrans count counter=rows|length trimmed %}
Displaying {{ counter }} item{% plural %}
Displaying {{ counter }} items{% endblocktrans %}</span>
{% if table.has_prev_data or table.has_more_data %}

5
openstack_dashboard/management/commands/update_catalog.py
View File

@ -19,6 +19,7 @@ import os
from subprocess import call
import babel.messages.catalog as catalog
import babel.messages.pofile as babel_pofile
from django.conf import settings
from django.core.management.base import BaseCommand
from django.utils import translation
@ -102,7 +103,7 @@ class Command(BaseCommand):
# Pseudo translation logic
with open(potfile, 'r') as f:
pot_cat = pofile.read_po(f, ignore_obsolete=True)
pot_cat = babel_pofile.read_po(f, ignore_obsolete=True)
new_cat = catalog.Catalog(locale=locale,
last_translator="pseudo.py",
@ -119,4 +120,4 @@ class Command(BaseCommand):
new_cat[msg.id] = msg
with open(pofile, 'w') as f:
pofile.write_po(f, new_cat, ignore_obsolete=True)
babel_pofile.write_po(f, new_cat, ignore_obsolete=True)