From: Matteo Nastasi (mop) Date: Thu, 3 Jan 2013 08:57:29 +0000 (+0100) Subject: typo fixed X-Git-Tag: v4.5.3~6 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=7379a6c57be3c4ced0871d429bc1de1d6e2a91f8;p=brisk.git typo fixed --- diff --git a/TODO.txt b/TODO.txt index 5941766..b25fc15 100644 --- a/TODO.txt +++ b/TODO.txt @@ -4,7 +4,7 @@ MAJOR | -------+ - BUG: some connection to the named socket fails - + - Page still opened after the server restart MINOR | -------+ @@ -385,8 +385,8 @@ sparir DONE - standup centrati DONE - current player - in info DONE - HELP butt con ABOUT, REGOLE, VERSIONE - DONE - wellcome lines in the chats (room and table) - DONE - wellcome lines in the chats (room and table) + DONE - welcome lines in the chats (room and table) + DONE - welcome lines in the chats (room and table) DONE - nomi in primo piano se vai sul quadrato DONE - to pass explicit config file to INSTALL.sh DONE - flag to create a config file diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 9d3f6b6..6249c43 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -905,7 +905,7 @@ class Room $ret .= sprintf('stat = "%s";', $user->stat); - $ret .= root_wellcome($user); + $ret .= root_welcome($user); if ($user->flags & USER_FLAG_DBFAILED) { $ret .= "gst.st = ".($user->step+1)."; "; $ret .= show_notify($mlang_brisk['db_failed'][$G_lang], 0, $mlang_brisk['btn_close'][$G_lang], 400, 140); @@ -2674,7 +2674,7 @@ function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time) } -function root_wellcome($user) +function root_welcome($user) { GLOBAL $root_wellarr, $G_lang; $ret = ""; diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 1d11f36..3e3fd5a 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -1428,7 +1428,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again) $ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);"; } if (!$is_again) - $ret .= table_wellcome($user); + $ret .= table_welcome($user); if ($is_transition && !$is_again) { // appena seduti al tavolo, play della mucca $ret .= playsound("cow.mp3"); @@ -1737,7 +1737,7 @@ function show_table_info(&$bri, &$table, $table_pos) return ($ret); } -function table_wellcome($user) +function table_welcome($user) { GLOBAL $table_wellarr, $G_lang; $ret = ""; diff --git a/web/index.php b/web/index.php index e3cb7c2..6c7b5b2 100644 --- a/web/index.php +++ b/web/index.php @@ -38,7 +38,7 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati 'en' => 'Standing players'), 'headline' => array('it' => 'briscola chiamata in salsa ajax', 'en' => 'declaration briscola in ajax sauce (Beta)'), - 'wellcome' => array('it' => 'Digita il tuo nickname per accedere ai tavoli della briscola', + 'welcome' => array('it' => 'Digita il tuo nickname per accedere ai tavoli della briscola', 'en' => 'Enter your nickname to access to the tables of briscola'), 'btn_enter' => array('it' => 'entra', 'en' => 'enter'), @@ -994,7 +994,7 @@ echo "$body"; ?>



- +