Merge pull request 'Online installer review' (#129) from feature/onli…

…ne-installer-review-r3 into release/v8.3.0

win-linux/extras/online-installer/res/langs/langs.iss

@@ -42,48 +42,9 @@ sv.CAPTION =ONLYOFFICE onlineinstallationsprogram
 sr_Cyrl_RS.CAPTION =ONLYOFFICE Онлајн Инсталатер
 he.CAPTION_TEXT =תוכנת ההתקנה המקוונת של ONLYOFFICE
 
-en.MSG_ERR_ARCH =The application cannot continue because this architecture is not supported.
-en_GB.MSG_ERR_ARCH =The application cannot continue because this architecture is not supported.
-ru.MSG_ERR_ARCH =Приложение не может продолжить работу, так как эта архитектура не поддерживается.
-de.MSG_ERR_ARCH =Die Anwendung kann nicht fortgesetzt werden, da diese Architektur nicht unterstützt wird.
-fr.MSG_ERR_ARCH =L'application ne peut pas continuer car cette architecture n'est pas prise en charge.
-es.MSG_ERR_ARCH =La aplicación no puede continuar porque esta arquitectura no es compatible.
-it.MSG_ERR_ARCH =L'applicazione non può continuare perché questa architettura non è supportata.
-ja.MSG_ERR_ARCH =このアーキテクチャがサポートされていないため、アプリケーションを続行できません。
-zh_CN.MSG_ERR_ARCH =应用程序无法继续，因为此架构不受支持。
-ro.MSG_ERR_ARCH =Procesul aplicației nu poate continua deoarece această arhitectură nu este acceptată.
-ar_SA.MSG_ERR_ARCH =لا يمكن متابعة التطبيق لأن هذه البنية غير معتمدة.
-bg.MSG_ERR_ARCH =Приложението не може да продължи, защото тази архитектура не се поддържа.
-cs.MSG_ERR_ARCH =Aplikace nemůže pokračovat, protože tato architektura není podporována.
-el.MSG_ERR_ARCH =Η εφαρμογή δεν μπορεί να συνεχιστεί επειδή αυτή η αρχιτεκτονική δεν υποστηρίζεται.
-fi.MSG_ERR_ARCH =Sovellus ei toimi, koska tätä arkkitehtuuria ei tueta.
-hy.MSG_ERR_ARCH =Հավելվածը չի կարող շարունակվել, քանի որ այս ճարտարապետությունը չի աջակցվում:
-ko.MSG_ERR_ARCH =이 아키텍처는 지원되지 않으므로 애플리케이션을 계속할 수 없습니다.
-lv.MSG_ERR_ARCH =Lietojumprogrammu nevar turpināt, jo šī arhitektūra netiek atbalstīta.
-nl.MSG_ERR_ARCH =De toepassing kan niet doorgaan omdat deze architectuur niet wordt ondersteund.
-pl.MSG_ERR_ARCH =Aplikacja nie może zostać uruchomiona, ponieważ dana architektura nie jest obsługiwana.
-pt_PT.MSG_ERR_ARCH =O aplicativo não pode continuar porque esta arquitetura não é suportada.
-sk.MSG_ERR_ARCH =Aplikácia nemôže pokračovať, pretože táto architektúra nie je podporovaná.
-sl.MSG_ERR_ARCH =Aplikacija ne more nadaljevati, ker ta arhitektura ni podprta.
-tr.MSG_ERR_ARCH =Bu mimari desteklenmediği için uygulama devam edemiyor.
-uk.MSG_ERR_ARCH =Застосунок не може продовжити роботу, оскільки ця архітектура не підтримується.
-vi.MSG_ERR_ARCH =Ứng dụng không thể tiếp tục vì cấu trúc này không được hỗ trợ.
-sr_Latn_RS.MSG_ERR_ARCH =Aplikacija ne može nastaviti jer ova arhitektura nije podržana.
-si.MSG_ERR_ARCH =මෙම නිර්මාණ ශිල්පයට සහාය නොදක්වන නිසා මෘදුකාංගයට ඉදිරියට යාමට නොහැකිය.
-be.MSG_ERR_ARCH =Прыкладанне не можа далей працаваць, бо гэтая архітэктура не падтрымліваецца.
-ca.MSG_ERR_ARCH =L'aplicació no pot continuar perquè aquesta arquitectura no és compatible.
-da.MSG_ERR_ARCH =Applikationen kan ikke fortsætte, da denne arkitektur ikke er understøttet.
-gl.MSG_ERR_ARCH =A aplicación non pode continuar porque esta arquitectura non é compatible.
-hu.MSG_ERR_ARCH =Az alkalmazás nem folytatódhat, mert ez az architektúra nem támogatott.
-id.MSG_ERR_ARCH =Aplikasi tidak bisa dilanjutkan karena arsitektur tidak mendukung.
-no.MSG_ERR_ARCH =Applikasjonen kan ikke fortsette fordi denne arkitekturen støttes ikke.
-et.MSG_ERR_ARCH =Rakendusega ei saa jätkata, sest seda arhitektuuri ei toetata.
-lt.MSG_ERR_ARCH =Programa negali būti tęsiama, nes ši architektūra nepalaikoma.
-hr.MSG_ERR_ARCH =Aplikacija ne može nastaviti jer ova arhitektura nije podržana.
-hi.MSG_ERR_ARCH =यह एप्लिकेशन जारी नहीं रह सकती क्योंकि यह आर्किटेक्चर समर्थित नहीं है।
-sv.MSG_ERR_ARCH =Applikationen kan inte fortsätta eftersom denna arkitektur inte stöds.
-sr_Cyrl_RS.MSG_ERR_ARCH =Апликација не може наставити јер ова архитектура није подржана.
-he.MSG_ERR_ARCH =היישום אינו יכול להמשיך מכיוון שארכיטקטורה זו אינה נתמכת.
+
+en.MSG_ERR_SYSTEM =The current version of the operating system is not supported. %1 requires Microsoft Windows 7 or newer.
+ru.MSG_ERR_SYSTEM =Текущая версия операционной системы не поддерживается. Для работы %1 требуется Microsoft Windows 7 или более новая версия.
 
 en.MSG_ERR_ALREADY_RUNNING =The application is already running.
 en_GB.MSG_ERR_ALREADY_RUNNING =The application is already running.
@@ -179,8 +140,8 @@ ru.LABEL_NO_OPTIONS =Дополнительные опции недоступн
 en.LABEL_NO_VER_AVAIL =No version available
 ru.LABEL_NO_VER_AVAIL =Нет доступной версии
 
-en.LABEL_WARN_CLOSE =This will install ONLYOFFICE Desktop Editors on your computer.\nIt is reccomended that you close all other applications before continuing.
-ru.LABEL_WARN_CLOSE =Программа установит ONLYOFFICE Desktop Editors на ваш компьютер.\nРекомендуется закрыть все прочие приложения перед тем, как продолжить.
+en.LABEL_WARN_CLOSE =This will install %1 on your computer.\nIt is recommended that you close all other applications before continuing.
+ru.LABEL_WARN_CLOSE =Программа установит %1 на ваш компьютер.\nРекомендуется закрыть все прочие приложения перед тем, как продолжить.
 
 en.LABEL_ALMOST_DONE =Just a bit more and we're done
 ru.LABEL_ALMOST_DONE =Еще немного и мы закончим

win-linux/extras/online-installer/src/main.cpp

@@ -3,6 +3,7 @@
 #include <locale>
 #include "resource.h"
 #include "utils.h"
+#include "baseutils.h"
 #include "translator.h"
 #include "../../src/defines.h"
 #include "../../src/prop/defines_p.h"
@@ -31,10 +32,19 @@ int WINAPI _tWinMain(_In_ HINSTANCE hInst, _In_opt_ HINSTANCE hPrevInstance, _In
         return 0;
     }
 
+    if (Utils::getWinVersion() < Utils::Win7) {
+        wstring msg(_TR(MSG_ERR_SYSTEM));
+        NS_Utils::Replace(msg, L"%1", _TR(CAPTION));
+        NS_Utils::ShowMessage(msg);
+        CloseHandle(hMutex);
+        return 0;
+    }
+
     if (HWND hWnd = FindWindow(WINDOW_CLASS_NAME, NULL)) {
         wstring msg(_TR(MSG_ERR_CLOSE_APP));
         NS_Utils::Replace(msg, L"%1", _T(WINDOW_NAME));
         NS_Utils::ShowMessage(msg);
+        CloseHandle(hMutex);
         return 0;
     }
 

win-linux/extras/online-installer/src/mainwindow.cpp

@@ -198,8 +198,10 @@ void MainWindow::initInstallationMode(const std::wstring &url)
     });
 
     /* Comment section */
+    wstring warn_text = _TR(LABEL_WARN_CLOSE);
+    NS_Utils::Replace(warn_text, L"%1", _T(WINDOW_NAME));
     Label *comntLbl = new Label(m_cenPanel);
-    comntLbl->setText(_TR(LABEL_WARN_CLOSE), true);
+    comntLbl->setText(warn_text, true);
     comntLbl->setGeometry(0, m_cenPanel->size().height - 130, m_cenPanel->size().width, 48);
     setLabelStyle(comntLbl);
 

win-linux/extras/online-installer/src/resource.h

@@ -8,7 +8,7 @@
 #define APP_LAUNCH_NAME           "\\DesktopEditors.exe"
 
 #define CAPTION                   VER_PRODUCTNAME_STR
-#define MSG_ERR_ARCH              "The application cannot continue because this architecture is not supported."
+#define MSG_ERR_SYSTEM            "The current version of the operating system is not supported. %1 requires Microsoft Windows 7 or newer."
 #define MSG_ERR_ALREADY_RUNNING   "The application is already running."
 #define MSG_ERR_CLOSE_APP         "Setup has detected that %1 is currently running. Please close all instances of it."
 #define MSG_REMOVE                "This will remove %1 and its components."
@@ -27,7 +27,7 @@
 #define LABEL_UNKN_PACK           "unknown package"
 #define LABEL_NO_OPTIONS          "No additional options available."
 #define LABEL_NO_VER_AVAIL        "No version available"
-#define LABEL_WARN_CLOSE          "This will install ONLYOFFICE Desktop Editors on your computer.\nIt is reccomended that you close all other applications before continuing."
+#define LABEL_WARN_CLOSE          "This will install %1 on your computer.\nIt is recommended that you close all other applications before continuing."
 #define LABEL_ALMOST_DONE         "Just a bit more and we're done"
 #define LABEL_INSTALL_COMPL       "%1 has been successfully installed on your computer.\nTo run the application after closing this installer, select the check box."
 #define LABEL_ERR_PROD_CODE       "Error while retrieving product code."