From 2ab6497e9e094c59113630bd5703990509ba908e Mon Sep 17 00:00:00 2001 From: Papoteur Date: Thu, 20 Jul 2017 23:29:29 +0200 Subject: Allow more internationalisation of URL --- usr/share/mageiawelcome/index.html | 10 +++++----- usr/share/mageiawelcome/mageiawelcome.py | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/usr/share/mageiawelcome/index.html b/usr/share/mageiawelcome/index.html index ed0d691..d68eb16 100644 --- a/usr/share/mageiawelcome/index.html +++ b/usr/share/mageiawelcome/index.html @@ -179,8 +179,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
$h_support
- $forum
- $wiki
+ $forum
+ $wiki
$chat
$bugs
@@ -207,7 +207,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  • $Sec
  • $B
    • - +

    $adminpass
    @@ -238,12 +238,12 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    $guirpmdrake

    $rpmdrake_desc

    -

    +


    $adminpass
    $urpmi
    -

    +

    diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index f553bd6..dca9bc3 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -43,6 +43,8 @@ def main(): #release = open("/etc/release", "r").read() release = subprocess.getoutput('lsb_release -sd') release = release[1:-1] + release_nb = subprocess.getoutput('lsb_release -sr') + release_nb = release_nb.strip() kernel = subprocess.getoutput('uname -r') if os.uname()[4] == 'x86_64': arch = '64-bit' @@ -78,13 +80,14 @@ def main(): l['welcome_btn'] = _("Welcome") l['welcome'] = _("Welcome") l['user'] = username - l['welcome_msg'] = _("

    Thank you for choosing Mageia!

    We have put in a lot of effort to provide you with the best possible system. We hope you will have a good experience with Mageia. If you feel that our project is a good idea, we would also appreciate any contribution you can make to it for next versions.

    To find out how you can help click here.

    Don't forget to tell your friends about Mageia.

    ") + l['welcome_msg'] = _("

    Thank you for choosing Mageia!

    We have put in a lot of effort to provide you with the best possible system. We hope you will have a good experience with Mageia. If you feel that our project is a good idea, we would also appreciate any contribution you can make to it for next versions.

    To find out how you can help click here.

    Don't forget to tell your friends about Mageia.

    ") l['mcc'] = _("Mageia Control Center") l['conf_update'] = _("Configure media sources and update system") l['inst_remove'] = _("Install and remove software") l['h_documentation'] = _("Documentation") l['h_documentation_url'] = _("https://wiki.mageia.org/en/Documentation") l['features'] = _("New Features") + l['mcc_url'] = _("http://doc.mageia.org/mcc/{0}/en/content/index.html").format(release_nb) l['relnotes'] = _("Release Notes") l['relnotes_url'] = _("https://wiki.mageia.org/en/Mageia_6_Release_Notes") l['errata'] = _("Errata") @@ -93,7 +96,9 @@ def main(): l['newcomers_url'] = _("https://wiki.mageia.org/en/Newcomers_start_here") l['h_support'] = _("Support") l['forum'] = _("Forums") + l['forum_url'] = _("https://forums.mageia.org/en/") l['wiki'] = _("Wiki") + l['wiki_url'] = _("https://wiki.mageia.org/en/Documentation") l['chat'] = _("Chat Room") l['bugs'] = _("Bugzilla") l['h_community'] = _("Community") @@ -103,6 +108,7 @@ def main(): l['joinus'] = _("Join us!") l['mccdesc'] = _("Mageia Control Center (aka drakconf) is a set of tools to help you configure your system") l['SM'] = _("Software Management") + l['SM_url'] = _("http://doc.mageia.org/mcc/{0}/en/content/software-management.html").format(release_nb) l['Oa'] = _("Online administration") l['H'] = _("Hardware") l['NI'] = _("Network & Internet") @@ -125,6 +131,7 @@ def main(): l['guirpmdrake'] = _("GUI - RPMDrake") l['rpmdrake_desc'] = _("Rpmdrake is a program for installing, uninstalling and updating packages. It is the graphical user interface of urpmi") l['readmore'] = _("read more (wiki)") + l['urpmi_url'] = _("https://wiki.mageia.org/en/URPMI") l['r_rpmdrake'] = _("RPMdrake") l['urpmi'] = _("URPMI - from command line") l['r_term'] = _("Terminal") -- cgit v1.2.1