mirror of
https://github.com/myvesta/vesta
synced 2025-08-14 10:37:42 -07:00
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
This commit is contained in:
parent
3b42d0a941
commit
6bf6cbd6d0
31 changed files with 75 additions and 37 deletions
|
@ -746,7 +746,7 @@ $LANG['ar'] = array(
|
|||
'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',
|
||||
|
|
|
@ -745,5 +745,6 @@ $LANG['bs'] = array(
|
|||
'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',
|
||||
|
||||
);
|
|
@ -746,5 +746,6 @@ $LANG['cn'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['cz'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -748,5 +748,6 @@ $LANG['da'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['de'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['el'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,6 +747,6 @@ $LANG['en'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -744,5 +744,6 @@ $LANG['es'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -749,7 +749,7 @@ $LANG['fa'] = [
|
|||
'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',
|
||||
|
|
|
@ -748,7 +748,7 @@ $LANG['fi'] = array(
|
|||
'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',
|
||||
|
|
|
@ -746,7 +746,7 @@ $LANG['fr'] = array(
|
|||
'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',
|
||||
|
|
|
@ -750,7 +750,7 @@ $LANG['hu'] = array(
|
|||
'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',
|
||||
|
|
|
@ -749,5 +749,6 @@ $LANG['id'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['it'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['ja'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['ka'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['nl'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['no'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['pl'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['pt-BR'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['pt'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['ro'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['ru'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -746,5 +746,6 @@ $LANG['se'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['tr'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -769,5 +769,6 @@ $LANG['tw'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -747,5 +747,6 @@ $LANG['ua'] = array(
|
|||
'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',
|
||||
|
||||
);
|
|
@ -745,5 +745,6 @@ $LANG['vi'] = array(
|
|||
'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',
|
||||
|
||||
);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue