Merge pull request #832 from open-eid/stable

Do not translate to RUS
open-eid · Oct 13, 2020 · 1ee0d56 · 1ee0d56
2 parents a5308d7 + 9889e04
commit 1ee0d56
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 if(POLICY CMP0074)
 	cmake_policy(SET CMP0074 NEW)
 endif()
-project(qdigidoc4 VERSION 4.2.6)
+project(qdigidoc4 VERSION 4.2.7)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

diff --git a/client/dialogs/MobileProgress.cpp b/client/dialogs/MobileProgress.cpp
@@ -329,7 +329,7 @@ std::vector<unsigned char> MobileProgress::sign(const std::string &method, const
 		{"hash", QByteArray::fromRawData((const char*)digest.data(), int(digest.size())).toBase64()},
 		{"hashType", digestMethod},
 		{"language", lang.value(Common::language(), QStringLiteral("EST"))},
-		{"displayText", tr("Sign document")},
+		{"displayText", tr("Sign document", "Do not translate to RUS (IB-6416)")},
 		{"displayTextFormat", "UCS-2"}
 	})).toJson();
 	d->req.setUrl(QUrl(QStringLiteral("%1/signature").arg(d->URL())));

diff --git a/client/dialogs/MobileProgress.h b/client/dialogs/MobileProgress.h
@@ -25,7 +25,7 @@
 
 class QWidget;
 
-class MobileProgress: public digidoc::Signer
+class MobileProgress final: public digidoc::Signer
 {
 	Q_DECLARE_TR_FUNCTIONS(MobileProgress)
 public:

diff --git a/client/dialogs/SmartIDProgress.cpp b/client/dialogs/SmartIDProgress.cpp
@@ -329,7 +329,7 @@ std::vector<unsigned char> SmartIDProgress::sign(const std::string &method, cons
 		{"hash", QByteArray::fromRawData((const char*)digest.data(), int(digest.size())).toBase64()},
 		{"hashType", digestMethod},
 		{"requestProperties", QVariantHash{{"vcChoice", true}}},
-		{"displayText", tr("Sign document")}
+		{"displayText", tr("Sign document", "Do not translate to RUS (IB-6416)")}
 	})).toJson();
 	d->req.setUrl(QUrl(QStringLiteral("%1/signature/document/%2").arg(d->URL(), d->documentNumber)));
 	qCDebug(SIDLog).noquote() << d->req.url() << data;

diff --git a/client/translations/en.ts b/client/translations/en.ts
@@ -1920,6 +1920,7 @@ and enter Smart-ID PIN2-code.</translation>
     </message>
     <message>
         <source>Sign document</source>
+        <comment>Do not translate to RUS (IB-6416)</comment>
         <translation>Sign document</translation>
     </message>
     <message>

diff --git a/client/translations/et.ts b/client/translations/et.ts
@@ -1920,6 +1920,7 @@ ja sisesta nutiseadmes Smart-ID PIN2-kood.</translation>
     </message>
     <message>
         <source>Sign document</source>
+        <comment>Do not translate to RUS (IB-6416)</comment>
         <translation>Allkirjasta dokument</translation>
     </message>
     <message>

diff --git a/client/translations/ru.ts b/client/translations/ru.ts
@@ -1923,7 +1923,8 @@ and enter Smart-ID PIN2-code.</source>
     </message>
     <message>
         <source>Sign document</source>
-        <translation>Подписать документ</translation>
+        <comment>Do not translate to RUS (IB-6416)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your Mobile-ID transaction has failed. Please contact your mobile network operator.</source>