aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-05-18 01:00:48 +0200
committerfilip <filip.komar@gmail.com>2016-05-18 01:00:48 +0200
commit63fcd5fd546432d68fc04ba59d1cad321e0586e7 (patch)
treef4cafe571c7377dab61c287963f684e3ccf7a6dc /en
parentee488e5225853b63f1e1aa756f83743b30a1b755 (diff)
downloadwww-63fcd5fd546432d68fc04ba59d1cad321e0586e7.tar
www-63fcd5fd546432d68fc04ba59d1cad321e0586e7.tar.gz
www-63fcd5fd546432d68fc04ba59d1cad321e0586e7.tar.bz2
www-63fcd5fd546432d68fc04ba59d1cad321e0586e7.tar.xz
www-63fcd5fd546432d68fc04ba59d1cad321e0586e7.zip
move 'Your IP ...' sentence where it fits better
Diffstat (limited to 'en')
-rw-r--r--en/downloads/get/index.php42
1 files changed, 20 insertions, 22 deletions
diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php
index 28579316a..2b7cfed17 100644
--- a/en/downloads/get/index.php
+++ b/en/downloads/get/index.php
@@ -139,13 +139,30 @@ try {
$mirrors_country_name = $one_mirror['country'];
}
$dl2_mirror_alt = sprintf(
- _r('This <a href="%s">%s</a> download mirror is located in %s (%s).'),
+ _r('This <a href="%s">%s</a> download mirror is located in %s (%s).', ' '),
$one_mirror['mirror_url'],
$one_mirror['mirror_host'],
rewrite_city($one_mirror['city']),
$mirrors_country_name
- )
- . ' ' . _r('If it does not work well for you, <a href="#om" id="other_mirrors_btn">check out these other mirrors</a>.');
+ );
+ $dl2_mirror_alt .= _r('If it does not work well for you, <a href="#om" id="other_mirrors_btn">check out these other mirrors</a>.', ' ');
+ if (array_key_exists($_SESSION['country'], $countries)) {
+ $country_name = $countries[$_SESSION['country']];
+ } else if (array_key_exists($_SESSION['country'], MGA_Geoip::$MGA_COUNTRY_CODE_TO_COUNTRY_NAME)) {
+ $country_name = MGA_Geoip::$MGA_COUNTRY_CODE_TO_COUNTRY_NAME[$_SESSION['country']];
+ } else {
+ $country_name = $_SESSION['country'];
+ }
+
+ if (array_key_exists($_SESSION['continent'], MGA_Geoip::$MGA_CONTINENT_CODE_TO_CONTINENT_NAME)) {
+ $continent_name = MGA_Geoip::$MGA_CONTINENT_CODE_TO_CONTINENT_NAME[$_SESSION['continent']];
+ } else {
+ $continent_name = $_SESSION['continent'];
+ }
+ $dl2_mirror_alt .= sprintf(
+ _r('Your IP address is %s and you seem to be in %s, %s.'),
+ $_SESSION['ip'], $country_name, $continent_name
+ );
// at the end of this block we expect the following vars to be available from here:
@@ -277,25 +294,6 @@ gpg: There is no indication that the signature belongs to the owner.
<p><?php _g('The warning about uncertified signature is expected.'); ?></p>
</div>
<?php } ?>
- <p><?php
- if (array_key_exists($_SESSION['country'], $countries)) {
- $country_name = $countries[$_SESSION['country']];
- } else if (array_key_exists($_SESSION['country'], MGA_Geoip::$MGA_COUNTRY_CODE_TO_COUNTRY_NAME)) {
- $country_name = MGA_Geoip::$MGA_COUNTRY_CODE_TO_COUNTRY_NAME[$_SESSION['country']];
- } else {
- $country_name = $_SESSION['country'];
- }
-
- if (array_key_exists($_SESSION['continent'], MGA_Geoip::$MGA_CONTINENT_CODE_TO_CONTINENT_NAME)) {
- $continent_name = MGA_Geoip::$MGA_CONTINENT_CODE_TO_CONTINENT_NAME[$_SESSION['continent']];
- } else {
- $continent_name = $_SESSION['continent'];
- }
- echo sprintf(
- _r('Your IP address is %s and you seem to be in %s, %s.'),
- $_SESSION['ip'], $country_name, $continent_name
- );
- ?></p>
</div>
<!-- alternative mirrors table -->