Translations update

- TTL hours/days now has correct plurals/paucals - TTL description updates better when changing language (was "X days") - language sources updated
Bitmessage · May 2, 2016 · ad6d55c · ad6d55c
1 parent 658d52f
commit ad6d55c
Show file tree

Hide file tree

Showing 32 changed files with 2,899 additions and 2,783 deletions.
diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
@@ -795,13 +795,10 @@ def updateTTL(self, sliderPosition):
     def updateHumanFriendlyTTLDescription(self, TTL):
         numberOfHours = int(round(TTL / (60*60)))
         if numberOfHours < 48:
-            if numberOfHours == 1:
-                self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "1 hour"))
-            else:
-                self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%1 hours").arg(numberOfHours))
+            self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%n hour(s)", None, QtCore.QCoreApplication.CodecForTr, numberOfHours))
         else:
             numberOfDays = int(round(TTL / (24*60*60)))
-            self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%1 days").arg(numberOfDays))
+            self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%n day(s)", None, QtCore.QCoreApplication.CodecForTr, numberOfDays))
 
     # Show or hide the application window after clicking an item within the
     # tray icon or, on Windows, the try icon itself.

diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py
@@ -23,11 +23,17 @@ def _fromUtf8(s):
 
 try:
     _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+    def _translate(context, text, disambig, encoding = QtCore.QCoreApplication.CodecForTr, n = None):
+        if n is None:
+            return QtGui.QApplication.translate(context, text, disambig, _encoding)
+        else:
+            return QtGui.QApplication.translate(context, text, disambig, _encoding, n)
 except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
+    def _translate(context, text, disambig, encoding = QtCore.QCoreApplication.CodecForTr, n = None):
+        if n is None:
+            return QtGui.QApplication.translate(context, text, disambig)
+        else:
+            return QtGui.QApplication.translate(context, text, disambig, QtCore.QCoreApplication.CodecForTr, n)
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -668,7 +674,12 @@ def retranslateUi(self, MainWindow):
         #self.textEditMessageBroadcast.setHtml("")
         self.tabWidgetSend.setTabText(self.tabWidgetSend.indexOf(self.sendBroadcast), _translate("MainWindow", "Send Message to your Subscribers", None))
         self.pushButtonTTL.setText(_translate("MainWindow", "TTL:", None))
-        self.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "X days", None))
+        hours = 48
+        try:
+            hours = int(shared.config.getint('bitmessagesettings', 'ttl')/60/60)
+        except:
+            pass
+        self.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%n hour(s)", None, QtCore.QCoreApplication.CodecForTr, hours))
         self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
         self.treeWidgetSubscriptions.headerItem().setText(0, _translate("MainWindow", "Subscriptions", None))

diff --git a/src/translations/bitmessage_ar.qm b/src/translations/bitmessage_ar.qm
diff --git a/src/translations/bitmessage_ar.ts b/src/translations/bitmessage_ar.ts
diff --git a/src/translations/bitmessage_cs.qm b/src/translations/bitmessage_cs.qm
diff --git a/src/translations/bitmessage_cs.ts b/src/translations/bitmessage_cs.ts
diff --git a/src/translations/bitmessage_da.qm b/src/translations/bitmessage_da.qm
diff --git a/src/translations/bitmessage_da.ts b/src/translations/bitmessage_da.ts
diff --git a/src/translations/bitmessage_de.qm b/src/translations/bitmessage_de.qm
diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts
diff --git a/src/translations/bitmessage_en.qm b/src/translations/bitmessage_en.qm
diff --git a/src/translations/bitmessage_en.ts b/src/translations/bitmessage_en.ts
diff --git a/src/translations/bitmessage_en_pirate.qm b/src/translations/bitmessage_en_pirate.qm
diff --git a/src/translations/bitmessage_en_pirate.ts b/src/translations/bitmessage_en_pirate.ts
diff --git a/src/translations/bitmessage_eo.qm b/src/translations/bitmessage_eo.qm
diff --git a/src/translations/bitmessage_eo.ts b/src/translations/bitmessage_eo.ts
diff --git a/src/translations/bitmessage_fr.qm b/src/translations/bitmessage_fr.qm
diff --git a/src/translations/bitmessage_fr.ts b/src/translations/bitmessage_fr.ts
diff --git a/src/translations/bitmessage_it.qm b/src/translations/bitmessage_it.qm
diff --git a/src/translations/bitmessage_it.ts b/src/translations/bitmessage_it.ts
diff --git a/src/translations/bitmessage_ja.qm b/src/translations/bitmessage_ja.qm
diff --git a/src/translations/bitmessage_ja.ts b/src/translations/bitmessage_ja.ts
diff --git a/src/translations/bitmessage_nl.qm b/src/translations/bitmessage_nl.qm
diff --git a/src/translations/bitmessage_nl.ts b/src/translations/bitmessage_nl.ts
diff --git a/src/translations/bitmessage_no.qm b/src/translations/bitmessage_no.qm
diff --git a/src/translations/bitmessage_no.ts b/src/translations/bitmessage_no.ts
diff --git a/src/translations/bitmessage_ru.qm b/src/translations/bitmessage_ru.qm
diff --git a/src/translations/bitmessage_ru.ts b/src/translations/bitmessage_ru.ts
diff --git a/src/translations/bitmessage_sk.qm b/src/translations/bitmessage_sk.qm
diff --git a/src/translations/bitmessage_sk.ts b/src/translations/bitmessage_sk.ts
diff --git a/src/translations/bitmessage_zh_cn.qm b/src/translations/bitmessage_zh_cn.qm
diff --git a/src/translations/bitmessage_zh_cn.ts b/src/translations/bitmessage_zh_cn.ts