Fixed code comments

CURA-4501

4 files changed, 28 insertions, 14 deletions

diff --git a/plugins/UserAgreementPlugin/UserAgreement.py b/plugins/UserAgreementPlugin/UserAgreement.py
index c565399735..5b6b266444 100644
--- a/plugins/UserAgreementPlugin/UserAgreement.py
+++ b/plugins/UserAgreementPlugin/UserAgreement.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from UM.Extension import Extension
@@ -14,10 +14,9 @@ from PyQt5.QtCore import QUrl, QObject, pyqtSlot
 
 import os.path
 
-class UserAgreement(Extension, QObject):
+class UserAgreement(QObject, Extension):
     def __init__(self, parent = None):
-        QObject.__init__(self, parent)
-        Extension.__init__(self)
+        super(UserAgreement, self).__init__()
         self._user_agreement_window = None
         self._user_agreement_context = None
         Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
@@ -36,11 +35,11 @@ class UserAgreement(Extension, QObject):
     @pyqtSlot(bool)
     def didAgree(self, userChoice):
         if userChoice:
-            Logger.log("i", 'User agreed to the user agreement')
+            Logger.log('i', 'User agreed to the user agreement')
             Preferences.getInstance().setValue("general/accepted_user_agreement", True)
             self._user_agreement_window.hide()
         else:
-            Logger.log("i", 'User did NOT agree to the user agreement')
+            Logger.log('i', 'User did NOT agree to the user agreement')
             Preferences.getInstance().setValue("general/accepted_user_agreement", False)
             CuraApplication.getInstance().quit()
 
diff --git a/plugins/UserAgreementPlugin/UserAgreement.qml b/plugins/UserAgreementPlugin/UserAgreement.qml
index a2dd34e23f..52d35a4f44 100644
--- a/plugins/UserAgreementPlugin/UserAgreement.qml
+++ b/plugins/UserAgreementPlugin/UserAgreement.qml
@@ -1,8 +1,8 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.4
 
 import UM 1.3 as UM
 
@@ -13,7 +13,7 @@ UM.Dialog
     minimumHeight: Math.floor(UM.Theme.getSize("modal_window_minimum").height * 0.5)
     width: minimumWidth
     height: minimumHeight
-    title: "User Agreement"
+    title: catalog.i18nc("@title:window", "User Agreement")
 
     TextArea
     {
@@ -36,10 +36,12 @@ UM.Dialog
         width: parent.width
         anchors.bottomMargin: UM.Theme.getSize("default_margin").height
 
+        UM.I18nCatalog { id: catalog; name:"cura" }
+
         Button
         {
             anchors.right: parent.right
-            text: "I understand and agree"
+            text: catalog.i18nc("@action:button", "I understand and agree")
             onClicked: {
                 manager.didAgree(true)
             }
@@ -48,7 +50,7 @@ UM.Dialog
         Button
         {
             anchors.left: parent.left
-            text: "I don't agree"
+            text: catalog.i18nc("@action:button", "I don't agree")
             onClicked: {
                 manager.didAgree(false)
             }
@@ -59,6 +61,4 @@ UM.Dialog
     onClosing: {
         manager.didAgree(false)
     }
-
-
 }
diff --git a/plugins/UserAgreementPlugin/__init__.py b/plugins/UserAgreementPlugin/__init__.py
index 635f8a6bc9..88cb151f9e 100644
--- a/plugins/UserAgreementPlugin/__init__.py
+++ b/plugins/UserAgreementPlugin/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from . import UserAgreement
diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
index fb4b9ed0d6..99ccd7a459 100644
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#Manually added for plugins/UserAgreementPlugin/UserAgreement.qml
+msgctxt "@title:window"
+msgid "User Agreement"
+msgstr ""
+
+#Manually added for plugins/UserAgreementPlugin/UserAgreement.qml
+msgctxt "@action:button"
+msgid "I understand and agree"
+msgstr ""
+
+#Manually added for plugins/UserAgreementPlugin/UserAgreement.qml
+msgctxt "@action:button"
+msgid "I don't agree"
+msgstr ""
+
 #: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
 msgctxt "@label:status"
 msgid "Print aborted"