Improving translation for mysql user length, fixing tabs, enabling mysql limit note for MariaDB too, adding documentation for is_it_mysql_or_mariadb() PHP function

myvesta · myvesta · commit 6bf6cbd6d076 · 2016-10-11T00:34:41.000Z
diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php
@@ -746,7 +746,7 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
 // Texts below doesn't exist in en.php
     '%s rule' => 'قواعد %s',
diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php
@@ -745,5 +745,6 @@
     'No encryption' => 'Bez enkripcije',
     'Do not use encryption' => 'Nemoj koristiti enkripciju',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix',
+
 );
diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php
@@ -748,5 +748,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php
@@ -747,6 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
 );
diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php
@@ -744,5 +744,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php
@@ -749,7 +749,7 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
 // Texts below doesn't exist in en.php
     '70 خط اخر  %s.%s.log' => 'هفتاد خط انتهايي از %s.%s.log',
diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php
@@ -748,7 +748,7 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
 // Texts below doesn't exist in en.php
     'traffic' => 'tiedonsiirto',
diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php
@@ -746,7 +746,7 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
 // Texts below doesn't exist in en.php
     'disk' => 'disque',
diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php
@@ -750,7 +750,7 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
 // Texts below doesn't exist in en.php
     'Bandwidth Usage eth1' => 'eth1 sávszélesség használat',
diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php
@@ -749,5 +749,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php
@@ -746,5 +746,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php
@@ -769,5 +769,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php
@@ -747,5 +747,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php
@@ -745,5 +745,6 @@
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
-	'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix',
+    'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+
 );
diff --git a/web/inc/main.php b/web/inc/main.php
@@ -3,7 +3,7 @@
 session_start();
 
 define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/');
-define('JS_LATEST_UPDATE', '1467758417');
+define('JS_LATEST_UPDATE', '1476144160');
 
 $i = 0;
 
@@ -346,11 +346,25 @@ function list_timezones() {
     return $timezone_list;
 }
 
+/**
+ * A function that tells is it MySQL installed on the system, or it is MariaDB.
+ *
+ * Explaination:
+ * $_SESSION['DB_SYSTEM'] has 'mysql' value even if MariaDB is installed, so you can't figure out is it really MySQL or it's MariaDB.
+ * So, this function will make it clear.
+ * 
+ * If MySQL is installed, function will return 'mysql' as a string.
+ * If MariaDB is installed, function will return 'mariadb' as a string.
+ * 
+ * Hint: if you want to check if PostgreSQL is installed - check value of $_SESSION['DB_SYSTEM']
+ *
+ * @return string
+ */
 function is_it_mysql_or_mariadb() {
-	exec (VESTA_CMD."v-list-sys-services json", $output, $return_var);
-	$data = json_decode(implode('', $output), true);
-	unset($output);
-	$mysqltype='mysql';
-	if (isset($data['mariadb'])) $mysqltype='mariadb';
-	return $mysqltype;
+    exec (VESTA_CMD."v-list-sys-services json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    unset($output);
+    $mysqltype='mysql';
+    if (isset($data['mariadb'])) $mysqltype='mariadb';
+    return $mysqltype;
 }
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
@@ -60,7 +60,8 @@
                                 <td class="vst-text input-label">
                                     <?php
                                         print __('User');
-                                        if (is_it_mysql_or_mariadb()=='mysql') echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum 16 characters length, including prefix').")</small></em>";
+                                        // if (is_it_mysql_or_mariadb()=='mysql')
+                                        echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum characters length, including prefix', 16).")</small></em>";
                                     ?>
                                 </td>
                             </tr>
