From: Matteo Nastasi (mop) Date: Wed, 4 Dec 2013 07:27:34 +0000 (+0100) Subject: manage translations for tos choices, increased button spaces for show_document form... X-Git-Tag: v4.11.0~6 X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=5fa01c83781bbb977710f84ec20ff882d59b8034 manage translations for tos choices, increased button spaces for show_document form, fix suffix name management in INSTALL.sh script --- diff --git a/INSTALL.sh b/INSTALL.sh index 82b928c..aae8e21 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -328,7 +328,7 @@ for i in $(find web -type d | sed 's/^....//g'); do install -d ${web_path}__/$i done -for i in $(find web -name '.htaccess' -o -name '*.php' -o -name '*.phh' -o -name '*.pho' -o -name '*.css' -o -name '*.js' -o -name '*.mp3' -o -name '*.swf' -o -name 'terms-of-use*.txt' | sed 's/^....//g'); do +for i in $(find web -name '.htaccess' -o -name '*.php' -o -name '*.phh' -o -name '*.pho' -o -name '*.css' -o -name '*.js' -o -name '*.mp3' -o -name '*.swf' -o -name 'terms-of-service*.txt' | sed 's/^....//g'); do install -m 644 "web/$i" "${web_path}__/$i" done chmod 755 "${web_path}__/spush/brisk-spush.php" diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 643f9ea..94df362 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -79,11 +79,18 @@ $S_load_stat = array( 'rU_heavy' => 0, 'wR_minusone' => 0, 'wR_the_end' => 0 ); -$mlang_indrd = array( +$mlang_user = array( 'btn_backtotab' => array('it' => ' torna ai tavoli ', 'en' => ' back to tables '), 'btn_btotabsup' => array('it' => ' grazie della donazione, torna ai tavoli ', - 'en' => ' thank you for donation, back to tables ') + 'en' => ' thank you for donation, back to tables '), + + 'btn_agree' => array('it' => ' accetto ', + 'en' => ' agree '), + 'btn_refuse' => array('it' => ' rifiuto ', + 'en' => ' refuse '), + 'btn_after' => array('it' => ' leggo poi ', + 'en' => ' read later ') ); class User { @@ -557,7 +564,7 @@ class User { protected function maincheck($get, $post, $cookie) { - GLOBAL $G_lang, $G_base, $mlang_indrd; + GLOBAL $G_lang, $G_base, $mlang_user; // GLOBAL $first_loop; GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx; GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout; @@ -615,9 +622,8 @@ class User { if (versions_cmp($this->rec->tos_vers_get(), $G_tos_vers) < 0) { // comparison between user version and current version if ($curtime > $G_tos_dtsoft) { // call notify soft - // FIXME: manage translations $ret .= show_notify_document(esclfhtml(file_get_contents($G_base.sprintf($G_tos_fname, $G_tos_vers, $G_lang))), - 0, array("Accetto.", "Rifiuto.", "Leggo poi.", /* , "Scarico." */), + 0, array($mlang_user['btn_agree'][$G_lang], $mlang_user['btn_refuse'][$G_lang], $mlang_user['btn_after'][$G_lang] /* , "Scarico." */), "tos_confirm", 600, 600, TRUE, 0); $ret .= sprintf("act_tosmgr('soft', g_nd.ret_get(), '%s', '%s');", xcape($this->rec->tos_vers_get()), xcape($G_tos_vers)); @@ -625,7 +631,7 @@ class User { else if ($curtime > $G_tos_dthard) { // call notify hard $ret .= show_notify_document(esclfhtml(file_get_contents($G_base.sprintf($G_tos_fname, $G_tos_vers, $G_lang))), - 0, array("Accetto.", "Rifiuto." /* , "Scarico." */), + 0, array($mlang_user['btn_agree'][$G_lang], $mlang_user['btn_refuse'][$G_lang] /* , "Scarico." */), "tos_confirm", 600, 600, TRUE, 0); $ret .= sprintf("act_tosmgr('hard', g_nd.ret_get(), '%s', '%s');", xcape($this->rec->tos_vers_get()), xcape($G_tos_vers)); @@ -637,11 +643,11 @@ class User { ($splashdate < $curtime - $G_splash_interval || $splashdate > $curtime)) { $is_super = $this->flags & USER_FLAG_TY_SUPER; - $ret .= show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), - ($is_super ? 0 : $G_splash_timeout), - // $mlang_indrd[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], - $mlang_indrd['btn_backtotab'][$G_lang], - $G_splash_w, $G_splash_h, true, + $ret .= show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), + ($is_super ? 0 : $G_splash_timeout), + // $mlang_user[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], + $mlang_user['btn_backtotab'][$G_lang], + $G_splash_w, $G_splash_h, true, ($is_super ? 0 : $G_splash_timeout)); $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime); } diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index fd47753..1439943 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -1012,7 +1012,7 @@ class Bin5_user extends User { protected function maincheck($get, $post, $cookie) { - GLOBAL $G_lang, $mlang_indrd; + GLOBAL $G_lang; GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx; GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout; diff --git a/web/commons.js b/web/commons.js index c5cee04..f0a0a98 100644 --- a/web/commons.js +++ b/web/commons.js @@ -695,8 +695,10 @@ function notify_document(st, text, tout, butt, confirm_func, w, h, is_opa, block cont.style.borderBottomStyle = "solid"; cont.style.borderBottomWidth = "1px"; cont.style.borderBottomColor = "gray"; - cont.style.height = (h - 30)+"px"; + cont.style.height = (h - 50)+"px"; cont.style.overflow = "auto"; + cont.style.textAlign = "left"; + cont.style.padding = "8px"; cont.style.fontFamily = "monospace"; cont.innerHTML = text;