Merge pull request #6624 from symless/v1-issue-6622-cmake-language

Updated build to include compiling of language files

CI/ubuntu1604.Dockerfile

@@ -11,8 +11,9 @@ FROM ubuntu:16.04
 RUN \
   sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts && \
-  apt-get install -y debhelper devscripts
+  apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends && \
+  rm -rf /var/lib/apt/lists/*
   
 # Set environment variables.
 ENV HOME /root

CI/ubuntu1804.Dockerfile

@@ -11,8 +11,10 @@ FROM ubuntu:18.04
 RUN \
   sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts && \
-  apt-get install -y debhelper devscripts
+  apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends && \
+  rm -rf /var/lib/apt/lists/*
+
 
 # Set environment variables.
 ENV HOME /root

CI/ubuntu1904.Dockerfile

@@ -11,8 +11,9 @@ FROM ubuntu:19.04
 RUN \
   sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts && \
-  apt-get install -y debhelper devscripts
+  apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends && \
+  rm -rf /var/lib/apt/lists/*
   
 # Set environment variables.
 ENV HOME /root

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /src/gui/res/lang/gui_en.ts
+    translation: /src/gui/res/lang/gui_%locale%.ts

src/gui/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.4)
 
-find_package (Qt5 COMPONENTS Core Widgets Network)
+find_package (Qt5 COMPONENTS Core Widgets Network LinguistTools)
 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)
 set (CMAKE_AUTOUIC ON)
@@ -10,6 +10,9 @@ file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
 file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
 file (GLOB LEGACY_ACTIVATION_FILES src/*Activation* src/*License*)
 file (GLOB LEGACY_ZEROCONF_FILES src/Zeroconf*)
+file (GLOB LEGACY_LANGUAGE_FILES res/lang/*.ts)
+
+qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES})
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     file (GLOB LEGACY_GUI_MAC_SOURCE_FILES src/*.mm)
@@ -31,6 +34,7 @@ add_executable (synergy WIN32
     ${LEGACY_GUI_UI_FILES}
     ${LEGACY_GUI_RC_FILES}
     res/Synergy.qrc
+    ${QM_FILES}
 )
 
 include_directories (./src)

src/gui/gui.pro

@@ -118,6 +118,48 @@ HEADERS += src/MainWindow.h \
     ../lib/shared/EditionType.h \
     ../lib/shared/SerialKey.h \
     src/LicenseManager.h
+TRANSLATIONS = res/lang/gui_ar-SA.ts \
+    res/lang/gui_bg-BG.ts \
+    res/lang/gui_ca-ES.ts \
+    res/lang/gui_cs-CZ.ts \
+    res/lang/gui_cy-GB.ts \
+    res/lang/gui_da-DK.ts \
+    res/lang/gui_de-DE.ts \
+    res/lang/gui_el-GR.ts \
+    res/lang/gui_es-ES.ts \
+    res/lang/gui_et-EE.ts \
+    res/lang/gui_fi-FI.ts \
+    res/lang/gui_fr-FR.ts \
+    res/lang/gui_gl-ES.ts \
+    res/lang/gui_he-IL.ts \
+    res/lang/gui_hr-HR.ts \
+    res/lang/gui_hu-HU.ts \
+    res/lang/gui_id-ID.ts \
+    res/lang/gui_it-IT.ts \
+    res/lang/gui_ja-JP.ts \
+    res/lang/gui_ko-KR.ts \
+    res/lang/gui_lt-LT.ts \
+    res/lang/gui_lv-LV.ts \
+    res/lang/gui_mr-IN.ts \
+    res/lang/gui_nl-NL.ts \
+    res/lang/gui_no-NO.ts \
+    res/lang/gui_pl-PL.ts \
+    res/lang/gui_pt-BR.ts \
+    res/lang/gui_pt-PT.ts \
+    res/lang/gui_ro-RO.ts \
+    res/lang/gui_ru-RU.ts \
+    res/lang/gui_sk-SK.ts \
+    res/lang/gui_sl-SI.ts \
+    res/lang/gui_sq-AL.ts \
+    res/lang/gui_sr-SP.ts \
+    res/lang/gui_sv-SE.ts \
+    res/lang/gui_th-TH.ts \
+    res/lang/gui_tr-TR.ts \
+    res/lang/gui_uk-UA.ts \
+    res/lang/gui_ur-IN.ts \
+    res/lang/gui_vi-VN.ts \
+    res/lang/gui_zh-CN.ts \
+    res/lang/gui_zh-TW.ts
 RESOURCES += res/Synergy.qrc
 RC_FILE = res/win/Synergy.rc
 macx { 

src/gui/res/Synergy.qrc

@@ -7,48 +7,6 @@
         <file>icons/16x16/warning.png</file>
         <file>icons/256x256/synergy.ico</file>
         <file>image/about.png</file>
-        <file>lang/gui_ar.qm</file>
-        <file>lang/gui_bg-BG.qm</file>
-        <file>lang/gui_ca-AD.qm</file>
-        <file>lang/gui_cs-CZ.qm</file>
-        <file>lang/gui_cy.qm</file>
-        <file>lang/gui_da.qm</file>
-        <file>lang/gui_de.qm</file>
-        <file>lang/gui_es.qm</file>
-        <file>lang/gui_fi.qm</file>
-        <file>lang/gui_fr.qm</file>
-        <file>lang/gui_grk.qm</file>
-        <file>lang/gui_he.qm</file>
-        <file>lang/gui_hr-HR.qm</file>
-        <file>lang/gui_hu-HU.qm</file>
-        <file>lang/gui_id.qm</file>
-        <file>lang/gui_it.qm</file>
-        <file>lang/gui_ja-JP.qm</file>
-        <file>lang/gui_ko.qm</file>
-        <file>lang/gui_lt.qm</file>
-        <file>lang/gui_lv.qm</file>
-        <file>lang/gui_nl-NL.qm</file>
-        <file>lang/gui_no.qm</file>
-        <file>lang/gui_pes-IR.qm</file>
-        <file>lang/gui_pl-PL.qm</file>
-        <file>lang/gui_pt-BR.qm</file>
-        <file>lang/gui_pt-PT.qm</file>
-        <file>lang/gui_ro.qm</file>
-        <file>lang/gui_ru.qm</file>
-        <file>lang/gui_si.qm</file>
-        <file>lang/gui_sk-SK.qm</file>
-        <file>lang/gui_sl-SI.qm</file>
-        <file>lang/gui_sq-AL.qm</file>
-        <file>lang/gui_sr.qm</file>
-        <file>lang/gui_sv.qm</file>
-        <file>lang/gui_th-TH.qm</file>
-        <file>lang/gui_tr-TR.qm</file>
-        <file>lang/gui_uk.qm</file>
-        <file>lang/gui_ur.qm</file>
-        <file>lang/gui_mr.qm</file>
-        <file>lang/gui_vi.qm</file>
-        <file>lang/gui_zh-CN.qm</file>
-        <file>lang/gui_zh-TW.qm</file>
         <file>lang/Languages.xml</file>
         <file>icons/16x16/money.png</file>
         <file>image/spinning-wheel.gif</file>

src/gui/res/lang/Languages.xml

@@ -1,46 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <languages>
   <language ietfCode="en" name="English" />
-	<language ietfCode="ca-AD" name="Català (Andorra)" />
+	<language ietfCode="ca-ES" name="Català (Andorra)" />
 	<language ietfCode="cs-CZ" name="Čeština" />
-	<language ietfCode="cy" name="Cymraeg" />
+	<language ietfCode="cy-GB" name="Cymraeg" />
-	<language ietfCode="da" name="Dansk" />
+	<language ietfCode="da-DK" name="Dansk" />
-	<language ietfCode="de" name="Deutsch" />
+	<language ietfCode="de-DE" name="Deutsch" />
-	<language ietfCode="es" name="Español" />
+	<language ietfCode="es-ES" name="Español" />
-	<language ietfCode="fr" name="Français" />
+	<language ietfCode="fr-FR" name="Français" />
 	<language ietfCode="hr-HR" name="Hrvatski" />
-	<language ietfCode="id" name="Indonesia" />
+	<language ietfCode="id-ID" name="Indonesia" />
-	<language ietfCode="it" name="Italiano" />
+	<language ietfCode="it-IT" name="Italiano" />
-	<language ietfCode="lv" name="Latvijas" />
+	<language ietfCode="lv-LV" name="Latvijas" />
-	<language ietfCode="lt" name="Lietuvos" />
+	<language ietfCode="lt-LT" name="Lietuvos" />
 	<language ietfCode="hu-HU" name="Magyar" />
 	<language ietfCode="nl-NL" name="Nederlands" />
-	<language ietfCode="no" name="Norsk" />
+	<language ietfCode="no-NO" name="Norsk" />
 	<language ietfCode="pl-PL" name="Polski" />
 	<language ietfCode="pt-PT" name="Português" />
 	<language ietfCode="pt-BR" name="Português (Brasil)" />
-	<language ietfCode="ro" name="Română" />
+	<language ietfCode="ro-RO" name="Română" />
 	<language ietfCode="sq-AL" name="Shqiptar" />
 	<language ietfCode="sl-SI" name="Slovenščina" />
 	<language ietfCode="sk-SK" name="Slovenčina" />
-	<language ietfCode="fi" name="Suomi" />
+	<language ietfCode="fi-FI" name="Suomi" />
-	<language ietfCode="sv" name="Svenska" />
+	<language ietfCode="sv-SE" name="Svenska" />
-	<language ietfCode="vi" name="Tiếng Việt" />
+	<language ietfCode="vi-VN" name="Tiếng Việt" />
 	<language ietfCode="tr-TR" name="Türkçe" />
 	<language ietfCode="bg-BG" name="български" />
-	<language ietfCode="ru" name="Русский" />
+	<language ietfCode="ru-RU" name="Русский" />
-	<language ietfCode="sr" name="српски" />
+	<language ietfCode="sr-SP" name="српски" />
-	<language ietfCode="uk" name="Український" />
+	<language ietfCode="uk-UA" name="Український" />
-	<language ietfCode="grk" name="Ελληνικά" />
+	<language ietfCode="el-GR" name="Ελληνικά" />
-	<language ietfCode="he" name="עברית" />
+	<language ietfCode="he-IL" name="עברית" />
-	<language ietfCode="ar" name="العربية" />
+	<language ietfCode="ar-SA" name="العربية" />
-	<language ietfCode="pes-IR" name="فارسی" />
+	<language ietfCode="ur-IN" name="اردو" />
-	<language ietfCode="ur" name="اردو" />
-	<language ietfCode="mr" name="मराठी" />
-	<language ietfCode="si" name="Sඉන්හල" />
 	<language ietfCode="th-TH" name="ภาษาไทย" />
 	<language ietfCode="zh-CN" name="中文 (简体)" />
 	<language ietfCode="zh-TW" name="中文 (繁體)" />
 	<language ietfCode="ja-JP" name="日本語" />
-	<language ietfCode="ko" name="한국어" />
+	<language ietfCode="ko-KR" name="한국어" />
 </languages>

src/gui/res/lang/gui_af-ZA.qm

@@ -1 +0,0 @@
-<ｸdﾊ<>箆!ｿ`｡ｽﾝ

src/gui/res/lang/gui_is-IS.qm

@@ -1 +0,0 @@
-<ｸdﾊ<>箆!ｿ`｡ｽﾝ