diff --git a/2048-qt_zh_CN.qm b/2048-qt_zh_CN.qm index 5e37846..561fa29 100644 Binary files a/2048-qt_zh_CN.qm and b/2048-qt_zh_CN.qm differ diff --git a/2048-qt_zh_CN.ts b/2048-qt_zh_CN.ts index ff7b020..60221e8 100644 --- a/2048-qt_zh_CN.ts +++ b/2048-qt_zh_CN.ts @@ -37,7 +37,7 @@ Join the numbers and get to the <b>2048 tile</b>! - 把数字相加,得到<b>2048</b>! + 把相同的数字相加,得到<b>2048</b>! Game Over diff --git a/main.cpp b/main.cpp index b800816..dad4fd9 100644 --- a/main.cpp +++ b/main.cpp @@ -12,10 +12,14 @@ int main(int argc, char *argv[]) // Localization QString locale = QLocale::system().name(); - qDebug() << "Locale: " + locale; + QString tsFile = "2048-qt_" + locale; QTranslator translator; - translator.load("2048-qt_" + locale); + if (translator.load(tsFile, ".")) { + qDebug() << "Successfully loaded " + tsFile; + } else { + qDebug() << "Failed to load " + tsFile; + } app.installTranslator(&translator); QQmlApplicationEngine engine; diff --git a/qml/main.qml b/qml/main.qml index a10dffc..899ef34 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -11,7 +11,7 @@ ApplicationWindow { width: 550 height: 740 title: qsTr("2048 Game"); - flags: Qt.Window | Qt.MSWindowsFixedSizeDialogHint +// flags: Qt.Window | Qt.WindowTitleHint | Qt.WindowMinimizeButtonHint | Qt.WindowCloseButtonHint | Qt.CustomizeWindowHint x: (Screen.width - width) / 2 y: (Screen.height - height) / 2 @@ -64,6 +64,7 @@ ApplicationWindow { Text { id: gameName + font.family: "Sans-serif" font.pixelSize: 55 font.bold: true text: "2048" @@ -86,6 +87,7 @@ ApplicationWindow { text: (index == 0) ? qsTr("SCORE") : qsTr("BEST") anchors.horizontalCenter: parent.horizontalCenter y: 7 + font.family: "Sans-serif" font.pixelSize: 13 color: helper.myColors.fglight } @@ -93,6 +95,7 @@ ApplicationWindow { text: scoreText anchors.horizontalCenter: parent.horizontalCenter y: 25 + font.family: "Sans-serif" font.pixelSize: 25 font.bold: true color: "white" @@ -102,6 +105,7 @@ ApplicationWindow { Text { id: addScoreText + font.family: "Sans-serif" font.pixelSize: 25 font.bold: true color: Qt.rgba(119/255, 110/255, 101/255, 0.9); @@ -142,6 +146,7 @@ ApplicationWindow { height: 40 text: qsTr("Join the numbers and get to the 2048 tile!") color: helper.myColors.fgdark + font.family: "Sans-serif" font.pixelSize: 16 verticalAlignment: Text.AlignVCenter } @@ -160,6 +165,7 @@ ApplicationWindow { anchors.centerIn: parent text: qsTr("New Game") color: helper.myColors.fgbutton + font.family: "Sans-serif" font.pixelSize: 18 font.bold: true }