summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-07-20 23:29:29 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-07-20 23:29:29 +0200
commit2ab6497e9e094c59113630bd5703990509ba908e (patch)
tree63289c83053fb7fc00ebbf19fcd10422053d4f97 /usr
parenta2266adf355b5a58ff5c6646e4d3ba1587e775ac (diff)
downloadmageiawelcome-2ab6497e9e094c59113630bd5703990509ba908e.tar
mageiawelcome-2ab6497e9e094c59113630bd5703990509ba908e.tar.gz
mageiawelcome-2ab6497e9e094c59113630bd5703990509ba908e.tar.bz2
mageiawelcome-2ab6497e9e094c59113630bd5703990509ba908e.tar.xz
mageiawelcome-2ab6497e9e094c59113630bd5703990509ba908e.zip
Allow more internationalisation of URL
Diffstat (limited to 'usr')
-rw-r--r--usr/share/mageiawelcome/index.html10
-rw-r--r--usr/share/mageiawelcome/mageiawelcome.py9
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"
</div>
<div class="mgalinks col_4">
<h5>$h_support</h5>
- <a href="https://forums.mageia.org/en/" class="weblink button medium"><i class="icon-heart"> </i> $forum</a><br />
- <a href="https://wiki.mageia.org/en/Documentation" class="weblink button medium"><i class="icon-globe"> </i> $wiki</a><br />
+ <a href="$forum_url" class="weblink button medium"><i class="icon-heart"> </i> $forum</a><br />
+ <a href="$wiki_url" class="weblink button medium"><i class="icon-globe"> </i> $wiki</a><br />
<a href="irc://irc.freenode.net/#mageia" class="weblink button medium"><i class="icon-comments"> </i> $chat</a><br />
<a href="https://bugs.mageia.org/" class="weblink button medium"><i class="icon-ambulance"> </i> $bugs</a><br />
</div>
@@ -207,7 +207,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<li><i class="icon-ok"> </i>$Sec</li>
<li><i class="icon-ok"> </i>$B</li>
</ul>
- <button href="http://doc.mageia.org/mcc/6/fr/content/index.html" class="medium blue inset weblink"><i class="icon-external-link"> </i> $h_documentation</button>
+ <button href="$mcc_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $h_documentation</button>
</div>
<div class="col_5 center"><div id="mcc"></div><button class="cmd" data-run="drakconf"><i class="icon-share-alt"> </i> $mcc</button><br /><span>$adminpass</span></div>
@@ -238,12 +238,12 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<h6>$guirpmdrake</h6>
</div>
<div class="col_9"> <p>$rpmdrake_desc</p>
- <p><button href="http://doc.mageia.org/mcc/5/en/content/software-management.html" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button>
+ <p><button href="$SM_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button>
</p></div>
<div class="col_3"><button class="cmd" data-run="rpmdrake"><i class="icon-share-alt"> </i> $r_rpmdrake</button><br /><span>$adminpass</span></div>
<h6 class="col_12">$urpmi</h6>
<div class="col_9">
- <p><button href="https://wiki.mageia.org/en/URPMI" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button></p>
+ <p><button href="$urpmi_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button></p>
</div>
<div class="col_3"><button class="cmd" data-run="xvt"><i class="icon-share-alt"> </i> $r_term</button></div>
</li>
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<!--user//-->")
l['user'] = username
- l['welcome_msg'] = _("<p>Thank you for choosing Mageia!</p><p>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.</p><p>To find out how you can help <a class='weblink' href='http://www.mageia.org/en/contribute/'>click here</a>.</p><p>Don't forget to tell your friends about Mageia.</p>")
+ l['welcome_msg'] = _("<p>Thank you for choosing Mageia!</p><p>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.</p><p>To find out how you can help <a class='weblink' href='http://www.mageia.org/contribute/'>click here</a>.</p><p>Don't forget to tell your friends about Mageia.</p>")
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'] = _("<span class='label green'>Rpmdrake</span> is a program for installing, uninstalling and updating packages. It is the graphical user interface of <span class='label green'>urpmi</span>")
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")