diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 0c8a224f..f19400a7 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -760,7 +760,7 @@ $lang = array( 'maxStanding' => "Niveau maximum", 'quartermaster' => "Intendant", 'customRewRate' => "Taux de récompense personnalisé", - '_transfer' => 'La réputation de cette faction sera convertie en %s si vous transférez vers %s.]', + '_transfer' => 'La réputation de cette faction sera convertie en %s si vous transférez vers %s.', 'cat' => array( 1118 => ["Classique", 469 => "Alliance", 169 => "Cartel Gentepression", 67 => "Horde", 891 => "Forces de l'Alliance", 892 => "Forces de la Horde"], 980 => ["The Burning Crusade", 936 => "Shattrath"], diff --git a/prQueue b/prQueue index 7f44d387..0ed859a2 100755 --- a/prQueue +++ b/prQueue @@ -44,6 +44,13 @@ $error = function ($type, $realmGUID, $realmId) // if (CFG_PROFILER_ENABLE) - wont work because it is not redefined if changed in config while (DB::Aowow()->selectCell('SELECT value FROM ?_config WHERE `key` = "profiler_enable"')) { + if (($tDiff = (microtime(true) - $tCycle)) < (CFG_PROFILER_QUEUE_DELAY / 1000)) + { + $wait = (CFG_PROFILER_QUEUE_DELAY / 1000) - $tDiff; + CLI::write('sleeping '.Lang::nf($wait, 2).'s..'); + usleep($wait * 1000 * 1000); + } + $row = DB::Aowow()->selectRow('SELECT * FROM ?_profiler_sync WHERE status = ?d ORDER BY requestTime ASC', PR_QUEUE_STATUS_WAITING); if (!$row) { @@ -97,13 +104,6 @@ while (DB::Aowow()->selectCell('SELECT value FROM ?_config WHERE `key` = "profil CLI::write('unknown type #'.$row['type'].' to sync into profiler. Removing from queue...', CLI::LOG_ERROR); } - if (($tDiff = (microtime(true) - $tCycle)) < (CFG_PROFILER_QUEUE_DELAY / 1000)) - { - $wait = (CFG_PROFILER_QUEUE_DELAY / 1000) - $tDiff; - CLI::write('sleeping '.Lang::nf($wait, 2).'s..'); - usleep($wait * 1000 * 1000); - } - $tCycle = microtime(true); // mark as ready diff --git a/static/css/Profiler.css b/static/css/Profiler.css index 7c2c66c0..bc20cfa6 100644 --- a/static/css/Profiler.css +++ b/static/css/Profiler.css @@ -123,10 +123,11 @@ background-position: left bottom; } +/* aowow - use placeholder property instead of texture input.search-character { background: white url(../images/enus/character.gif) 0.2em center no-repeat !important; } - +*/ /*********************************************/ .profiler-header { diff --git a/static/js/global.js b/static/js/global.js index f01b0d3e..6ff1bb3c 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -20112,7 +20112,7 @@ var MapViewer = new function() { tempParent = $WH.ce('div'); tempParent.id = 'fewuiojfdksl'; - $WH.ae(document.body, tempParent); + $WH.aef(document.body, tempParent); // aowow - aef() insteead of ae() - rather scroll page to top instead of bottom var map = new Mapper({ parent: tempParent.id }); map.setLink(opt.link, true); map.toggleZoom(); diff --git a/static/js/profile.js b/static/js/profile.js index 53b8226d..9522348b 100644 --- a/static/js/profile.js +++ b/static/js/profile.js @@ -617,6 +617,8 @@ function pr_onBreadcrumbUpdate() // Add character lookup textbox to the breadcru i.className = 'search-character'; i.type = 'text'; + i.placeholder = LANG.tab_character + LANG.ellipsis; // aowow - use placeholder text instead of background texture + i.onfocus = function() { this.className = '';