summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-02-18 16:45:14 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-03-11 10:32:02 (GMT)
commitfcb5204aeacd6c4bf49223f133df285f22f7cd4b (patch)
treebbc4680d89515bbd55142a9acc5b60c5e5e6d957 /Swift/QtUI/QtVCardWidget/QtVCardRoleField.h
parent2ec46186d21b0e9620e56da2430c6eadf170bf3b (diff)
downloadswift-fcb5204aeacd6c4bf49223f133df285f22f7cd4b.zip
swift-fcb5204aeacd6c4bf49223f133df285f22f7cd4b.tar.bz2
Fix translatability of vCard editor popup menu items
Previously a preprocess macro expansion variable was passed into Qt's tr() function. Qt's translation tool did not pick these stings up. Test-Information: Builds on OS X 10.11.3 with Qt 5.4.2. Provided german translations for some of the items in the popup menu and then ran Swift with --language de. The translated popup menu items were correctly translated in the UI as expected. Change-Id: I50aeac9dd7277e1ce07b5a362c7474962dbcfad4
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardRoleField.h')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardRoleField.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardRoleField.h b/Swift/QtUI/QtVCardWidget/QtVCardRoleField.h
index 3c819ed..f2d5e75 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardRoleField.h
+++ b/Swift/QtUI/QtVCardWidget/QtVCardRoleField.h
@@ -4,13 +4,19 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <Swiften/Elements/VCard.h>
-#include "QtResizableLineEdit.h"
-#include "QtVCardFieldInfo.h"
-#include "QtVCardGeneralField.h"
+#include <Swift/QtUI/QtVCardWidget/QtResizableLineEdit.h>
+#include <Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h>
+#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h>
namespace Swift {
@@ -18,7 +24,7 @@ class QtVCardRoleField : public QtVCardGeneralField {
Q_OBJECT
public:
- GENERIC_QT_VCARD_FIELD_INFO("Role", UNLIMITED_INSTANCES, QtVCardRoleField)
+ GENERIC_QT_VCARD_FIELD_INFO(tr("Role"), UNLIMITED_INSTANCES, QtVCardRoleField)
QtVCardRoleField(QWidget* parent = 0, QGridLayout* layout = 0, bool editable = false);
virtual ~QtVCardRoleField();