From: Florian Fricke <fricke@webit.de>
Date: Thu, 14 Dec 2017 14:37:18 +0000 (+0100)
Subject: [FEATURE] change labels
X-Git-Tag: 3.4.0~38
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/refs/merge-requests/41/head

[FEATURE] change labels
---

diff --git a/lib/functions.js.php b/lib/functions.js.php
index d552cd8..7177b85 100644
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -607,17 +607,17 @@ function upload_time_estimation_speed_string()
     if (s <= 1000)
     {
         res = s.toString();
-        scale = "o/s";
+        scale = "Bit/s";
     }
     else if (s < 1000000)
     {
         res = Math.floor(s/100) / 10;
-        scale = "Ko/s";
+        scale = "KBit/s";
     }
     else
     {
         res = Math.floor(s/100000) / 10;
-        scale = "Mo/s";
+        scale = "Mbit/s";
     }
     if (res == 0)
         return '';
@@ -627,7 +627,14 @@ function upload_time_estimation_speed_string()
 function milliseconds_to_time_string (milliseconds)
 {
     function numberEnding (number) {
+      var currentLanguage = '<?php echo $cfg['lang']; ?>';
+
+      if(currentLanguage == 'de') {
+        return (number > 1) ? 'n' : '';
+      }
+      else {
         return (number > 1) ? 's' : '';
+      }
     }
 
     var temp = Math.floor(milliseconds / 1000);