diff options
Diffstat (limited to 'modules-available/baseconfig')
-rw-r--r-- | modules-available/baseconfig/hooks/translation.inc.php | 10 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/de/config-variable-categories.json (renamed from modules-available/baseconfig/lang/de/cat_setting.json) | 0 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/de/config-variables.json (renamed from modules-available/baseconfig/lang/de/setting.json) | 0 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/de/module.json | 3 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/en/config-variable-categories.json (renamed from modules-available/baseconfig/lang/en/cat_setting.json) | 0 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/en/config-variables.json (renamed from modules-available/baseconfig/lang/en/setting.json) | 0 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/pt/config-variable-categories.json | 7 | ||||
-rw-r--r-- | modules-available/baseconfig/lang/pt/config-variables.json | 16 | ||||
-rw-r--r-- | modules-available/baseconfig/page.inc.php | 4 | ||||
-rw-r--r-- | modules-available/baseconfig/templates/_page.html | 7 |
10 files changed, 35 insertions, 12 deletions
diff --git a/modules-available/baseconfig/hooks/translation.inc.php b/modules-available/baseconfig/hooks/translation.inc.php index 84a6d33a..4f2cd8f7 100644 --- a/modules-available/baseconfig/hooks/translation.inc.php +++ b/modules-available/baseconfig/hooks/translation.inc.php @@ -6,7 +6,7 @@ $HANDLER = array(); * List of valid subsections */ $HANDLER['subsections'] = array( - 'categories', 'settings' + 'config-variable-categories', 'config-variables' ); /* @@ -17,11 +17,11 @@ $HANDLER['subsections'] = array( /** * Configuration categories */ -$HANDLER['grep']['categories'] = function($module) { +$HANDLER['grep_config-variable-categories'] = function($module) { $want = array(); $res = Database::simpleQuery("SELECT catid FROM cat_setting ORDER BY catid ASC"); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $want[] = 'cat_' . $row['catid']; + $want['cat_' . $row['catid']] = true; } return $want; }; @@ -29,11 +29,11 @@ $HANDLER['grep']['categories'] = function($module) { /** * Configuration variables */ -$HANDLER['grep']['settings'] = function($module) { +$HANDLER['grep_config-variables'] = function($module) { $want = array(); $res = Database::simpleQuery("SELECT setting FROM setting ORDER BY setting ASC"); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $want[] = $row['setting']; + $want[$row['setting']] = true; } return $want; }; diff --git a/modules-available/baseconfig/lang/de/cat_setting.json b/modules-available/baseconfig/lang/de/config-variable-categories.json index b8cb6935..b8cb6935 100644 --- a/modules-available/baseconfig/lang/de/cat_setting.json +++ b/modules-available/baseconfig/lang/de/config-variable-categories.json diff --git a/modules-available/baseconfig/lang/de/setting.json b/modules-available/baseconfig/lang/de/config-variables.json index af1007be..af1007be 100644 --- a/modules-available/baseconfig/lang/de/setting.json +++ b/modules-available/baseconfig/lang/de/config-variables.json diff --git a/modules-available/baseconfig/lang/de/module.json b/modules-available/baseconfig/lang/de/module.json new file mode 100644 index 00000000..461bebdb --- /dev/null +++ b/modules-available/baseconfig/lang/de/module.json @@ -0,0 +1,3 @@ +{ + "module_name": "KonfigurationsVariablen" +}
\ No newline at end of file diff --git a/modules-available/baseconfig/lang/en/cat_setting.json b/modules-available/baseconfig/lang/en/config-variable-categories.json index 7c0ab654..7c0ab654 100644 --- a/modules-available/baseconfig/lang/en/cat_setting.json +++ b/modules-available/baseconfig/lang/en/config-variable-categories.json diff --git a/modules-available/baseconfig/lang/en/setting.json b/modules-available/baseconfig/lang/en/config-variables.json index 36ac6e8c..36ac6e8c 100644 --- a/modules-available/baseconfig/lang/en/setting.json +++ b/modules-available/baseconfig/lang/en/config-variables.json diff --git a/modules-available/baseconfig/lang/pt/config-variable-categories.json b/modules-available/baseconfig/lang/pt/config-variable-categories.json new file mode 100644 index 00000000..b04839e8 --- /dev/null +++ b/modules-available/baseconfig/lang/pt/config-variable-categories.json @@ -0,0 +1,7 @@ +{ + "cat_1": "Inatividade e Desligamento", + "cat_2": "Acesso \u00e0 Internet", + "cat_3": "Sincroniza\u00e7\u00e3o de Tempo", + "cat_4": "Sistema B\u00e1sico", + "cat_7": "vmchooser" +}
\ No newline at end of file diff --git a/modules-available/baseconfig/lang/pt/config-variables.json b/modules-available/baseconfig/lang/pt/config-variables.json new file mode 100644 index 00000000..66ec3b1c --- /dev/null +++ b/modules-available/baseconfig/lang/pt/config-variables.json @@ -0,0 +1,16 @@ +{ + "SLX_ADDONS": "Para carregar addons. Atualmente apenas o vmware est\u00e1 dispon\u00edvel.", + "SLX_BIOS_CLOCK": "Especifica se e como o rel\u00f3gio interno do computador deve ser definido em rela\u00e7\u00e3o ao hor\u00e1rio do sistema do \/MiniLinux\/.*off* = O rel\u00f3gio interno do computador n\u00e3o \u00e9 alterado.*local* = O rel\u00f3gio interno est\u00e1 definido para a hora local. De prefer\u00eancia se, por exemplo, ainda existe uma instala\u00e7\u00e3o Windows nativo dispon\u00edvel no PC.*utc* = O rel\u00f3gio interno \u00e9 definido para o \/Tempo Universal Coordenado\/. Esta \u00e9 a configura\u00e7\u00e3o mais comum em um ambiente puramente Linux", + "SLX_LOGOUT_TIMEOUT": "Hora \/em segundos\/, em que uma sess\u00e3o de usu\u00e1rio pode permanecer sem a\u00e7\u00e3o antes de ser encerrada.Deixe o campo em branco para desativar a fun\u00e7\u00e3o.", + "SLX_NET_DOMAIN": "Dom\u00ednio DNS no qual o cliente se integra, desde que o servidor DHCP n\u00e3o especifique tal.", + "SLX_NTP_SERVER": "Endere\u00e7o do servidor de hor\u00e1rio NTP. V\u00e1rios servidores podem ser especificados separados por espa\u00e7os.Os servidores s\u00e3o consultados em seq\u00fc\u00eancia at\u00e9 que um servidor respondendo for encontrado.", + "SLX_PROXY_BLACKLIST": "Intervalos de endere\u00e7os em que o servidor proxy n\u00e3o \u00e9 usado (por exemplo, o intervalo de endere\u00e7o do dispositivo). As entradas v\u00e1lidas s\u00e3o endere\u00e7os IP individuais e intervalos de IP em nota\u00e7\u00e3o CIDR (por exemplo 1.2.0.0\/16). Sele\u00e7\u00f5es m\u00faltiplas podem ser separadas por espa\u00e7os.", + "SLX_PROXY_IP": "O endere\u00e7o de servidor proxy a ser usado.", + "SLX_PROXY_MODE": "Determina se um servidor proxy \u00e9 necess\u00e1rio para acessar a Internet.*off* = n\u00e3o utilizar proxy.*on* = sempre utilizar proxy.*auto* = apenas utilizar proxy quando o PC cliente estiver em um espa\u00e7o de endere\u00e7o privado.", + "SLX_PROXY_PORT": "A porta a ser utilizada pelo servidor proxy.", + "SLX_PROXY_TYPE": "Tipo do proxy.*socks4*, *socks5*,*http-connect* (Proxy HTTP com suporte ao m\u00e9todo CONNECT),*http-relay* (Cl\u00e1ssico proxy HTTP)", + "SLX_REMOTE_LOG_SESSIONS": "Determina se logins e logouts dos usu\u00e1rios devem ser reportados ao sat\u00e9lite.*yes* = Login com ID de usu\u00e1rio*anonymous* = login an\u00f4nimo*no* = sem login", + "SLX_ROOT_PASS": "A senha root do sistema base. Exigido somente para fins de diagn\u00f3stico no cliente.Deixar campo em branco para n\u00e3o permitir login com root.\/Dica\/: A senha \u00e9 criptografada com hash $6$, ent\u00e3o se torna ileg\u00edvel ap\u00f3s ser salva!", + "SLX_SHUTDOWN_SCHEDULE": "Hor\u00e1rio fixo para desligar o computador, at\u00e9 mesmo caso tenha um usu\u00e1rio ativo.M\u00faltiplos hor\u00e1rios podem ser especificados, separados por espa\u00e7os.", + "SLX_SHUTDOWN_TIMEOUT": "Tempo em segundos no qual um computador \u00e9 desligado, caso n\u00e3o tenha um usu\u00e1rio logado.Deixar em branco para desabilitar a fun\u00e7\u00e3o." +}
\ No newline at end of file diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php index 8f914376..e741dd2e 100644 --- a/modules-available/baseconfig/page.inc.php +++ b/modules-available/baseconfig/page.inc.php @@ -82,12 +82,12 @@ class Page_BaseConfig extends Page LEFT JOIN setting_global AS tbl USING (setting) ORDER BY cat_setting.sortval ASC, setting.setting ASC'); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $row['description'] = Util::markup(Page::translate($row['setting'], 'setting')); + $row['description'] = Util::markup(Dictionary::translateFile('config-variables', $row['setting'])); if (is_null($row['displayvalue'])) $row['displayvalue'] = $row['defaultvalue']; $row['item'] = $this->makeInput($row['validator'], $row['setting'], $row['displayvalue']); $settings[$row['catid']]['settings'][] = $row; if (!isset($settings[$row['catid']]['category_id'])) { - $settings[$row['catid']]['category_name'] = Page::translate('cat_' . $row['catid'], 'cat_setting'); + $settings[$row['catid']]['category_name'] = Dictionary::translateFile('config-variable-categories', 'cat_' . $row['catid']); $settings[$row['catid']]['category_id'] = $row['catid']; } } diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html index 273ee50c..da155ad2 100644 --- a/modules-available/baseconfig/templates/_page.html +++ b/modules-available/baseconfig/templates/_page.html @@ -17,14 +17,11 @@ {{#settings}} <div class="list-group-item {{class}}"> <div class="row"> - <div class="col-md-1" style="width:118px;"> - <input type="checkbox" name="switch[{{setting}}]" {{checked}}> - </div> - <div class="col-md-4"> + <div class="col-md-5"> {{setting}} <div class="slx-default">{{defaultvalue}}</div> </div> - <div class="col-md-4"> + <div class="col-md-5"> {{{item}}} </div> <div class="col-md-2"> |