Merge pull request #154 from gjo/translation-ja-4

Translation ja 4
2013-12-20 12:38:22 -08:00
parent f598f08ccb 8b39253bfd
commit 2a8dd789b1
4 changed files with 101 additions and 72 deletions
--- a/colander/init.py
+++ b/colander/init.py
@@ -423,11 +423,13 @@ def luhnok(node, value):
        sum = _luhnok(value)
    except:
        raise Invalid(node,
-                      '%r is not a valid credit card number' % value)
+                      _('"${val}" is not a valid credit card number',
+                        mapping={'val': value}))

    if not (sum % 10) == 0:
        raise Invalid(node,
-                      '%r is not a valid credit card number' % value)
+                      _('"${val}" is not a valid credit card number',
+                        mapping={'val': value}))

 def _luhnok(value):
    sum = 0
--- a/colander/locale/colander.pot
+++ b/colander/locale/colander.pot
@@ -3,135 +3,149 @@
 # This file is distributed under the same license as the colander project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: colander 1.0a3\n"
+"Project-Id-Version: colander 1.0b1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-19 13:15+0200\n"
+"POT-Creation-Date: 2013-11-16 14:23+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"

-#: colander/__init__.py:233
+#: colander/__init__.py:240
 msgid "Invalid value"
 msgstr ""

-#: colander/__init__.py:270
+#: colander/__init__.py:283
 msgid "String does not match expected pattern"
 msgstr ""

-#: colander/__init__.py:287
+#: colander/__init__.py:302
 msgid "Invalid email address"
 msgstr ""

-#: colander/__init__.py:315
+#: colander/__init__.py:330
 msgid "${val} is less than minimum value ${min}"
 msgstr ""

-#: colander/__init__.py:316
+#: colander/__init__.py:331
 msgid "${val} is greater than maximum value ${max}"
 msgstr ""

-#: colander/__init__.py:348
+#: colander/__init__.py:363
 msgid "Shorter than minimum length ${min}"
 msgstr ""

-#: colander/__init__.py:354
+#: colander/__init__.py:369
 msgid "Longer than maximum length ${max}"
 msgstr ""

-#: colander/__init__.py:367
+#: colander/__init__.py:382
 msgid "\"${val}\" is not one of ${choices}"
 msgstr ""

-#: colander/__init__.py:377
+#: colander/__init__.py:392
 msgid "One or more of the choices you made was not acceptable"
 msgstr ""

-#: colander/__init__.py:423
+#: colander/__init__.py:414 colander/__init__.py:419
+msgid "\"${val}\" is not a valid credit card number"
+msgstr ""
+
+#: colander/__init__.py:440
 msgid "Must be a URL"
 msgstr ""

-#: colander/__init__.py:519
+#: colander/__init__.py:536
 msgid "\"${val}\" is not a mapping type: ${err}"
 msgstr ""

-#: colander/__init__.py:560
+#: colander/__init__.py:578
 msgid "Unrecognized keys in mapping: \"${val}\""
 msgstr ""

-#: colander/__init__.py:656 colander/__init__.py:856
+#: colander/__init__.py:674 colander/__init__.py:905
 msgid "\"${val}\" is not iterable"
 msgstr ""

-#: colander/__init__.py:664
+#: colander/__init__.py:682
 msgid "\"${val}\" has an incorrect number of elements (expected ${exp}, was ${was})"
 msgstr ""

-#: colander/__init__.py:803
+#: colander/__init__.py:821 colander/__init__.py:852
 msgid "${cstruct} is not iterable"
 msgstr ""

-#: colander/__init__.py:1075
+#: colander/__init__.py:1124
 msgid "${val} cannot be serialized: ${err}"
 msgstr ""

-#: colander/__init__.py:1093
+#: colander/__init__.py:1142
 msgid "${val} is not a string: ${err}"
 msgstr ""

-#: colander/__init__.py:1113 colander/__init__.py:1124
+#: colander/__init__.py:1162 colander/__init__.py:1173
 msgid "\"${val}\" is not a number"
 msgstr ""

-#: colander/__init__.py:1268
+#: colander/__init__.py:1317
 msgid "${val} is not a string"
 msgstr ""

-#: colander/__init__.py:1279
+#: colander/__init__.py:1328
 msgid "\"${val}\" is neither in (${false_choices}) nor in (${true_choices})"
 msgstr ""

-#: colander/__init__.py:1339 colander/__init__.py:1356 colander/__init__.py:1366
+#: colander/__init__.py:1388 colander/__init__.py:1405 colander/__init__.py:1415
 msgid "relative name \"${val}\" irresolveable without package"
 msgstr ""

-#: colander/__init__.py:1396
+#: colander/__init__.py:1445
 msgid "\"${val}\" has no __name__"
 msgstr ""

-#: colander/__init__.py:1405
+#: colander/__init__.py:1454
 msgid "\"${val}\" is not a string"
 msgstr ""

-#: colander/__init__.py:1414
+#: colander/__init__.py:1463
 msgid "The dotted name \"${name}\" cannot be imported"
 msgstr ""

-#: colander/__init__.py:1462 colander/__init__.py:1538
+#: colander/__init__.py:1511 colander/__init__.py:1587
 msgid "Invalid date"
 msgstr ""

-#: colander/__init__.py:1478
+#: colander/__init__.py:1527
 msgid "\"${val}\" is not a datetime object"
 msgstr ""

-#: colander/__init__.py:1549
+#: colander/__init__.py:1598
 msgid "\"${val}\" is not a date object"
 msgstr ""

-#: colander/__init__.py:1610
+#: colander/__init__.py:1659
 msgid "Invalid time"
 msgstr ""

-#: colander/__init__.py:1621
+#: colander/__init__.py:1670
 msgid "\"${val}\" is not a time object"
 msgstr ""

-#: colander/__init__.py:1878 colander/__init__.py:1880
+#: colander/__init__.py:1795
 msgid "Required"
 msgstr ""
+
+#: colander/tests/test_colander.py:295 colander/tests/test_colander.py:302
+msgid "fail ${val}"
+msgstr ""
+
+#: colander/tests/test_colander.py:469
+msgid "${val}: ${choices}"
+msgstr ""
+
--- a/colander/locale/ja/LC_MESSAGES/colander.mo
+++ b/colander/locale/ja/LC_MESSAGES/colander.mo
--- a/colander/locale/ja/LC_MESSAGES/colander.po
+++ b/colander/locale/ja/LC_MESSAGES/colander.po
@@ -1,14 +1,14 @@
 # Japanese translations for colander.
 # Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the colander project.
-# OCHIAI, Gouji <gjo.ext@gmail.com>, 2012.
+# OCHIAI, Gouji <gjo.ext@gmail.com>, 2012-2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: colander 0.8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-19 13:15+0200\n"
-"PO-Revision-Date: 2012-03-28 01:12+0900\n"
+"POT-Creation-Date: 2013-11-16 14:23+0900\n"
+"PO-Revision-Date: 2013-11-16 14:30+0900\n"
 "Last-Translator: OCHIAI, Gouji <gjo.ext@gmail.com>\n"
 "Language-Team: ja <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
@@ -17,125 +17,138 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"

-#: colander/__init__.py:233
+#: colander/__init__.py:240
 msgid "Invalid value"
 msgstr "無効な値です"

-#: colander/__init__.py:270
+#: colander/__init__.py:283
 msgid "String does not match expected pattern"
 msgstr "文字列がパターンに一致しません"

-#: colander/__init__.py:287
+#: colander/__init__.py:302
 msgid "Invalid email address"
 msgstr "無効なメールアドレスです"

-#: colander/__init__.py:315
+#: colander/__init__.py:330
 msgid "${val} is less than minimum value ${min}"
 msgstr "${val} は最小値 ${min} を下回っています"

-#: colander/__init__.py:316
+#: colander/__init__.py:331
 msgid "${val} is greater than maximum value ${max}"
 msgstr "${val} は最大値 ${max} を超過しています"

-#: colander/__init__.py:348
+#: colander/__init__.py:363
 msgid "Shorter than minimum length ${min}"
 msgstr "${min} 以上の長さが必要です"

-#: colander/__init__.py:354
+#: colander/__init__.py:369
 msgid "Longer than maximum length ${max}"
 msgstr "${max} より短くしてください"

-#: colander/__init__.py:367
+#: colander/__init__.py:382
 msgid "\"${val}\" is not one of ${choices}"
 msgstr "\"${val}\" は ${choices} のいずれかでなければなりません"

-#: colander/__init__.py:377
+#: colander/__init__.py:392
 msgid "One or more of the choices you made was not acceptable"
-msgstr ""
+msgstr "選択された値のいくつかが許容される値ではありません"

-#: colander/__init__.py:423
+#: colander/__init__.py:414 colander/__init__.py:419
+msgid "\"${val}\" is not a valid credit card number"
+msgstr "\"${val}\" は妥当なクレジットカード番号ではありません"
+
+#: colander/__init__.py:440
 msgid "Must be a URL"
-msgstr ""
+msgstr "URLでなければなりません"

-#: colander/__init__.py:519
+#: colander/__init__.py:536
 msgid "\"${val}\" is not a mapping type: ${err}"
 msgstr "\"${val}\" はマップ型でなければなりません: ${err}"

-#: colander/__init__.py:560
+#: colander/__init__.py:578
 msgid "Unrecognized keys in mapping: \"${val}\""
 msgstr "未定義のキーがマップに含まれています: \"${val}\""

-#: colander/__init__.py:656 colander/__init__.py:856
+#: colander/__init__.py:674 colander/__init__.py:905
 msgid "\"${val}\" is not iterable"
 msgstr "\"${val}\" は iterable でなければなりません"

-#: colander/__init__.py:664
+#: colander/__init__.py:682
 msgid ""
 "\"${val}\" has an incorrect number of elements (expected ${exp}, was "
 "${was})"
 msgstr "\"${val}\" の要素数が正しくありません (${exp} 個のはずが ${was} 個)"

-#: colander/__init__.py:803
+#: colander/__init__.py:821 colander/__init__.py:852
 msgid "${cstruct} is not iterable"
 msgstr "${cstruct} は iterable でなければなりません"

-#: colander/__init__.py:1075
+#: colander/__init__.py:1124
 msgid "${val} cannot be serialized: ${err}"
 msgstr "${val} が直列化できません: ${err}"

-#: colander/__init__.py:1093
+#: colander/__init__.py:1142
 msgid "${val} is not a string: ${err}"
 msgstr "${val} は文字列ではありません: ${err}"

-#: colander/__init__.py:1113 colander/__init__.py:1124
+#: colander/__init__.py:1162 colander/__init__.py:1173
 msgid "\"${val}\" is not a number"
 msgstr "\"${val}\" は数値ではありません"

-#: colander/__init__.py:1268
+#: colander/__init__.py:1317
 msgid "${val} is not a string"
 msgstr "${val} は文字列ではありません"

-#: colander/__init__.py:1279
+#: colander/__init__.py:1328
 msgid "\"${val}\" is neither in (${false_choices}) nor in (${true_choices})"
-msgstr ""
+msgstr "\"${val}\" が (${false_choices}) にも (${true_choices}) にも該当しません"

-#: colander/__init__.py:1339 colander/__init__.py:1356
-#: colander/__init__.py:1366
+#: colander/__init__.py:1388 colander/__init__.py:1405
+#: colander/__init__.py:1415
 msgid "relative name \"${val}\" irresolveable without package"
 msgstr "相対名 \"${val}\" はパッケージを指定しなければ名前解決できません"

-#: colander/__init__.py:1396
+#: colander/__init__.py:1445
 msgid "\"${val}\" has no __name__"
 msgstr "\"${val}\" には __name__ が含まれていません"

-#: colander/__init__.py:1405
+#: colander/__init__.py:1454
 msgid "\"${val}\" is not a string"
 msgstr "\"${val}\" は文字列ではありません"

-#: colander/__init__.py:1414
+#: colander/__init__.py:1463
 msgid "The dotted name \"${name}\" cannot be imported"
 msgstr "ドット区切り名  \"${name}\" がインポートできませんでした"

-#: colander/__init__.py:1462 colander/__init__.py:1538
+#: colander/__init__.py:1511 colander/__init__.py:1587
 msgid "Invalid date"
 msgstr "無効な日付です"

-#: colander/__init__.py:1478
+#: colander/__init__.py:1527
 msgid "\"${val}\" is not a datetime object"
 msgstr "\"${val}\" は datetime オブジェクトではありません"

-#: colander/__init__.py:1549
+#: colander/__init__.py:1598
 msgid "\"${val}\" is not a date object"
 msgstr "\"${val}\" は date オブジェクトではありません"

-#: colander/__init__.py:1610
+#: colander/__init__.py:1659
 msgid "Invalid time"
 msgstr "無効な時刻です"

-#: colander/__init__.py:1621
+#: colander/__init__.py:1670
 msgid "\"${val}\" is not a time object"
 msgstr "\"${val}\" は time オブジェクトではありません"

-#: colander/__init__.py:1878 colander/__init__.py:1880
+#: colander/__init__.py:1795
 msgid "Required"
 msgstr "必須です"
+
+#: colander/tests/test_colander.py:295 colander/tests/test_colander.py:302
+msgid "fail ${val}"
+msgstr "失敗 ${val}"
+
+#: colander/tests/test_colander.py:469
+msgid "${val}: ${choices}"
+msgstr "${val}: ${choices}"
+