Attachment 14081 Details for Bug 32412 – new patch

[patch] new patch

conditional_hostname_v2.patch (text/plain), 1.37 KB, created by Aurelian R on 2023-10-22 22:01:14 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2023-10-22 22:01:14 CEST

Size: 1.37 KB

patch

obsolete

>diff -Nurp mga-coffee-2.0/Main.qml mga-coffee-2.0_new/Main.qml
>--- mga-coffee-2.0/Main.qml	2023-10-22 00:36:38.455787113 +0300
>+++ mga-coffee-2.0_new/Main.qml	2023-10-22 22:48:03.859689991 +0300
>@@ -98,11 +98,20 @@ Rectangle {
>                     verticalAlignment: Text.AlignVCenter
>                     height: text.implicitHeight
>                     width: parent.width
>-                    text: textConstants.welcomeText.arg(sddm.hostName)
>                     wrapMode: Text.WordWrap
>                     font.pixelSize: 18
>                     elide: Text.ElideRight
>                     horizontalAlignment: Text.AlignHCenter
>+                    function getLocaleText() {
>+                        var localeText = "\n in "
>+                        if(Qt.locale().name.substring(0,2)=="fr") { localeText = "\n dans "; }
>+                        if(Qt.locale().name.substring(0,2)=="es") { localeText = "\n en "; }
>+                        if(Qt.locale().name.substring(0,2)=="it") { localeText = "\n in "; }
>+                        if(Qt.locale().name.substring(0,2)=="de") { localeText = "\n unter "; }
>+                        return localeText
>+                    }
>+                    text: textConstants.welcomeText.arg("Mageia!") +
>+                          ( sddm.hostName == "localhost" ? "" : getLocaleText() + sddm.hostName )
>                 }
> 
>                 Column {

diff -Nurp mga-coffee-2.0/Main.qml mga-coffee-2.0_new/Main.qml
--- mga-coffee-2.0/Main.qml	2023-10-22 00:36:38.455787113 +0300
+++ mga-coffee-2.0_new/Main.qml	2023-10-22 22:48:03.859689991 +0300
@@ -98,11 +98,20 @@ Rectangle {
                     verticalAlignment: Text.AlignVCenter
                     height: text.implicitHeight
                     width: parent.width
-                    text: textConstants.welcomeText.arg(sddm.hostName)
                     wrapMode: Text.WordWrap
                     font.pixelSize: 18
                     elide: Text.ElideRight
                     horizontalAlignment: Text.AlignHCenter
+                    function getLocaleText() {
+                        var localeText = "\n in "
+                        if(Qt.locale().name.substring(0,2)=="fr") { localeText = "\n dans "; }
+                        if(Qt.locale().name.substring(0,2)=="es") { localeText = "\n en "; }
+                        if(Qt.locale().name.substring(0,2)=="it") { localeText = "\n in "; }
+                        if(Qt.locale().name.substring(0,2)=="de") { localeText = "\n unter "; }
+                        return localeText
+                    }
+                    text: textConstants.welcomeText.arg("Mageia!") +
+                          ( sddm.hostName == "localhost" ? "" : getLocaleText() + sddm.hostName )
                 }
 
                 Column {

Actions: View | Diff

Attachments on bug 32412: 14071 | 14072 | 14073 | 14074 | 14075 | 14077 | 14079 | 14081 | 14082 | 14084 | 14142 | 14146