Merge pull request #163 from hugovk/i18n-and

src/humanize/i18n.py

@@ -101,7 +101,7 @@ def ngettext(message, plural, num):
     """Plural version of gettext.
 
     Args:
-        message (str): Singlular text to translate.
+        message (str): Singular text to translate.
         plural (str): Plural text to translate.
         num (str): The number (e.g. item count) to determine translation for the
             respective grammatical number.

src/humanize/locale/de_DE/LC_MESSAGES/humanize.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-22 16:30+0200\n"
+"POT-Creation-Date: 2020-09-29 21:07+0300\n"
 "PO-Revision-Date: 2016-12-18 11:50+0100\n"
 "Last-Translator: Christian Klein <chris@5711.org>\n"
 "Language-Team: German\n"
@@ -19,264 +19,269 @@ msgstr ""
 "Generated-By: Christian Klein\n"
 "X-Generator: Sublime Text 3\n"
 
-#: src/humanize/number.py:22
+#: src/humanize/number.py:31
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:23
+#: src/humanize/number.py:32
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:24
+#: src/humanize/number.py:33
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:25
+#: src/humanize/number.py:34
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:26
+#: src/humanize/number.py:35
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:27
+#: src/humanize/number.py:36
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:28
+#: src/humanize/number.py:37
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:29
+#: src/humanize/number.py:38
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:30
+#: src/humanize/number.py:39
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:40
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:73
+#: src/humanize/number.py:82
 msgid "million"
 msgstr "Million"
 
-#: src/humanize/number.py:74
+#: src/humanize/number.py:83
 msgid "billion"
 msgstr "Milliarde"
 
-#: src/humanize/number.py:75
+#: src/humanize/number.py:84
 msgid "trillion"
 msgstr "Billion"
 
-#: src/humanize/number.py:76
+#: src/humanize/number.py:85
 msgid "quadrillion"
 msgstr "Billiarde"
 
-#: src/humanize/number.py:77
+#: src/humanize/number.py:86
 msgid "quintillion"
 msgstr "Trillion"
 
-#: src/humanize/number.py:78
+#: src/humanize/number.py:87
 msgid "sextillion"
 msgstr "Trilliarde"
 
-#: src/humanize/number.py:79
+#: src/humanize/number.py:88
 msgid "septillion"
 msgstr "Quadrillion"
 
-#: src/humanize/number.py:80
+#: src/humanize/number.py:89
 msgid "octillion"
 msgstr "Quadrillarde"
 
-#: src/humanize/number.py:81
+#: src/humanize/number.py:90
 msgid "nonillion"
 msgstr "Quintillion"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:91
 msgid "decillion"
 msgstr "Quintilliarde"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:92
 msgid "googol"
 msgstr "Googol"
 
-#: src/humanize/number.py:138
+#: src/humanize/number.py:147
 msgid "zero"
 msgstr "null"
 
-#: src/humanize/number.py:139
+#: src/humanize/number.py:148
 msgid "one"
 msgstr "eins"
 
-#: src/humanize/number.py:140
+#: src/humanize/number.py:149
 msgid "two"
 msgstr "zwei"
 
-#: src/humanize/number.py:141
+#: src/humanize/number.py:150
 msgid "three"
 msgstr "drei"
 
-#: src/humanize/number.py:142
+#: src/humanize/number.py:151
 msgid "four"
 msgstr "vier"
 
-#: src/humanize/number.py:143
+#: src/humanize/number.py:152
 msgid "five"
 msgstr "fünf"
 
-#: src/humanize/number.py:144
+#: src/humanize/number.py:153
 msgid "six"
 msgstr "sechs"
 
-#: src/humanize/number.py:145
+#: src/humanize/number.py:154
 msgid "seven"
 msgstr "sieben"
 
-#: src/humanize/number.py:146
+#: src/humanize/number.py:155
 msgid "eight"
 msgstr "acht"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:156
 msgid "nine"
 msgstr "neun"
 
-#: src/humanize/time.py:87
+#: src/humanize/time.py:119
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d Mikrosekunde"
 msgstr[1] "%d Mikrosekunden"
 
-#: src/humanize/time.py:93
+#: src/humanize/time.py:128
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d Millisekunde"
 msgstr[1] "%d Millisekunden"
 
-#: src/humanize/time.py:96 src/humanize/time.py:170
+#: src/humanize/time.py:131 src/humanize/time.py:204
 msgid "a moment"
 msgstr "ein Moment"
 
-#: src/humanize/time.py:98
+#: src/humanize/time.py:133
 msgid "a second"
 msgstr "eine Sekunde"
 
-#: src/humanize/time.py:100
+#: src/humanize/time.py:135
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/humanize/time.py:102
+#: src/humanize/time.py:137
 msgid "a minute"
 msgstr "eine Minute"
 
-#: src/humanize/time.py:105
+#: src/humanize/time.py:140
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/humanize/time.py:107
+#: src/humanize/time.py:142
 msgid "an hour"
 msgstr "eine Stunde"
 
-#: src/humanize/time.py:110
+#: src/humanize/time.py:145
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/humanize/time.py:113
+#: src/humanize/time.py:148
 msgid "a day"
 msgstr "ein Tag"
 
-#: src/humanize/time.py:115 src/humanize/time.py:118
+#: src/humanize/time.py:150 src/humanize/time.py:153
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: src/humanize/time.py:120
+#: src/humanize/time.py:155
 msgid "a month"
 msgstr "ein Monat"
 
-#: src/humanize/time.py:122
+#: src/humanize/time.py:157
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d Monat"
 msgstr[1] "%d Monate"
 
-#: src/humanize/time.py:125
+#: src/humanize/time.py:160
 msgid "a year"
 msgstr "ein Jahr"
 
-#: src/humanize/time.py:127 src/humanize/time.py:136
+#: src/humanize/time.py:162 src/humanize/time.py:171
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "ein Jahr und %d Tag"
 msgstr[1] "ein Jahr und %d Tage"
 
-#: src/humanize/time.py:130
+#: src/humanize/time.py:165
 msgid "1 year, 1 month"
 msgstr "ein Monat"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:168
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "ein Jahr und %d Monat"
 msgstr[1] "ein Jahr und %d Monate"
 
-#: src/humanize/time.py:138
+#: src/humanize/time.py:173
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d Jahr"
 msgstr[1] "%d Jahre"
 
-#: src/humanize/time.py:167
+#: src/humanize/time.py:201
 #, python-format
 msgid "%s from now"
 msgstr "%s ab jetzt"
 
-#: src/humanize/time.py:167
+#: src/humanize/time.py:201
 #, python-format
 msgid "%s ago"
 msgstr "vor %s"
 
-#: src/humanize/time.py:171
+#: src/humanize/time.py:205
 msgid "now"
 msgstr "jetzt"
 
-#: src/humanize/time.py:190
+#: src/humanize/time.py:227
 msgid "today"
 msgstr "heute"
 
-#: src/humanize/time.py:192
+#: src/humanize/time.py:229
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/humanize/time.py:194
+#: src/humanize/time.py:231
 msgid "yesterday"
 msgstr "gestern"
+
+#: src/humanize/time.py:498
+#, python-format
+msgid "%s and %s"
+msgstr "%s und %s"