diff --git a/django/bin/make-messages.py b/django/bin/make-messages.py index c78faac694..ea4f76b4aa 100755 --- a/django/bin/make-messages.py +++ b/django/bin/make-messages.py @@ -70,7 +70,13 @@ for lang in languages: if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % ( os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) - msgs = os.popen(cmd, 'r').read() + (stdin, stdout, stderr) = os.popen3(cmd, 'r') + msgs = stdout.read() + errors = stderr.read() + if errors: + print "errors happened while running xgettext on %s" % file + print errors + sys.exit(8) if thefile != file: old = '#: '+os.path.join(dirpath, thefile)[2:] new = '#: '+os.path.join(dirpath, file)[2:] @@ -80,10 +86,22 @@ for lang in languages: if thefile != file: os.unlink(os.path.join(dirpath, thefile)) - msgs = os.popen('msguniq %s' % potfile, 'r').read() + (stdin, stdout, stderr) = os.popen3('msguniq %s' % potfile, 'r') + msgs = stdout.read() + errors = stderr.read() + if errors: + print "errors happened while running msguniq" + print errors + sys.exit(8) open(potfile, 'w').write(msgs) if os.path.exists(pofile): - msgs = os.popen('msgmerge %s %s' % (pofile, potfile), 'r').read() + (stdin, stdout, stderr) = os.popen3('msgmerge -q %s %s' % (pofile, potfile), 'r') + msgs = stdout.read() + errors = stderr.read() + if errors: + print "errors happened while running msgmerge" + print errors + sys.exit(8) open(pofile, 'wb').write(msgs) os.unlink(potfile) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 8f9ee21b3a..72c8bd9dc5 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -41,11 +41,12 @@ LANGUAGES = ( ('fr', _('French')), ('gl', _('Galician')), ('it', _('Italian')), - ('no-nb', _('Norwegian')), + ('no', _('Norwegian')), ('pt-br', _('Brazilian')), ('ru', _('Russian')), ('sr', _('Serbian')), ('zh-cn', _('Simplified Chinese')), + ('sk', _('Slovak')), ) # Not-necessarily-technical managers of the site. They get broken link @@ -147,6 +148,26 @@ SECRET_KEY = '' # Path to the "jing" executable -- needed to validate XMLFields JING_PATH = "/usr/bin/jing" +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. +# Example: "http://media.lawrence.com" +MEDIA_URL = '' + +# Default formatting for date objects. See all available format strings here: +# http://www.djangoproject.com/documentation/templates/#now +DATE_FORMAT = 'N j, Y' + +# Default formatting for datetime objects. See all available format strings here: +# http://www.djangoproject.com/documentation/templates/#now +DATETIME_FORMAT = 'N j, Y, P' + +# Default formatting for time objects. See all available format strings here: +# http://www.djangoproject.com/documentation/templates/#now +TIME_FORMAT = 'P' + ############## # MIDDLEWARE # ############## @@ -204,11 +225,3 @@ COMMENTS_FIRST_FEW = 0 # A tuple of IP addresses that have been banned from participating in various # Django-powered features. BANNED_IPS = () - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. -# Example: "http://media.lawrence.com" -MEDIA_URL = '' diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 792ea342d1..40c1e6145c 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index cb17afc08e..a2c0426d91 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -5,48 +5,126 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 18:22+0100\n" +"POT-Creation-Date: 2005-11-08 09:05-0600\n" "PO-Revision-Date: 2005-10-31 19:42+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Poedit-Language: Czech\n" +"X-Poedit-Country: CZECH REPUBLIC\n" -#: contrib/admin/models/admin.py:6 -msgid "action time" -msgstr "čas akce" - -#: contrib/admin/models/admin.py:9 -msgid "object id" -msgstr "object id" - -#: contrib/admin/models/admin.py:10 -msgid "object repr" -msgstr "object repr" - -#: contrib/admin/models/admin.py:11 -msgid "action flag" -msgstr "příznak akce" - -#: contrib/admin/models/admin.py:12 -msgid "change message" -msgstr "zpráva změny" - -#: contrib/admin/models/admin.py:15 -msgid "log entry" -msgstr "log záznam" - -#: contrib/admin/models/admin.py:16 -msgid "log entries" -msgstr "log záznamy" - -#: contrib/admin/templatetags/admin_list.py:256 -msgid "All dates" +#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106 +#, python-format +msgid "" +"

By %s:

\n" +"