hacked "rel"-parameter into the language-menu

it should now show the tooltip for the current page again, in every language availabele

- forgot to move a string inside the french localization
- added missing strings to spanish, french and russian localization. Fixes an jsError in the Browsers console.
This commit is contained in:
Sarjuuk
2012-12-27 22:50:39 +01:00
parent 19d08d1d18
commit 6ab86caff2
6 changed files with 35 additions and 22 deletions

View File

@@ -53,7 +53,6 @@ $lang = array(
'serversideHint' => "[These informations are not in the Client and have been provided by sniffing and/or guessing.]", 'serversideHint' => "[These informations are not in the Client and have been provided by sniffing and/or guessing.]",
), ),
'game' => array ( 'game' => array (
'remaining' => "%s restantes",
'requires' => "Requiert", 'requires' => "Requiert",
'cooldown' => "%s de recharge", 'cooldown' => "%s de recharge",
'classes' => "Classes", 'classes' => "Classes",
@@ -146,6 +145,7 @@ $lang = array(
'zonePartOf' => "Cette zone fait partie de la zone", 'zonePartOf' => "Cette zone fait partie de la zone",
), ),
'spell' => array( 'spell' => array(
'remaining' => "%s restantes",
'castIn' => "%s s d'incantation", 'castIn' => "%s s d'incantation",
'instantPhys' => "Incantation immédiate", 'instantPhys' => "Incantation immédiate",
'instantMagic' => "Instantanée", 'instantMagic' => "Instantanée",

View File

@@ -271,7 +271,7 @@ if (typeof $WowheadPower == "undefined") {
locale = $WH.g_getLocaleFromDomain(domain); locale = $WH.g_getLocaleFromDomain(domain);
/* edit start */ /* edit start */
if (!locale) { if (domain == "www") {
for (i in document.scripts) { for (i in document.scripts) {
if (!document.scripts[i].src) if (!document.scripts[i].src)
continue; continue;

View File

@@ -551,10 +551,10 @@ function g_getCursorPos(e) {
y; y;
if (window.innerHeight) { if (window.innerHeight) {
// ok, something of a workaround here... MS9+ sends a MSEventObj istead of mouseEvent . whatever // ok, something of a workaround here... MS9+ sends a MSEventObj istead of mouseEvent . whatever
// but the properties for that are client[X|Y] DIAF! // but the properties for that are client[X|Y] DIAF!
if (!e.pageX || !e.pageY) { if (!e.pageX || !e.pageY) {
x = e.clientX; x = e.clientX;
y = e.clientY y = e.clientY
@@ -1001,12 +1001,17 @@ function g_initHeaderMenus() {
d = d.substr(0, j) d = d.substr(0, j)
} }
//c.menu = [[0, "Deutsch", (g_locale.id != 3 ? d.replace(g, "de") : null)], [0, "English", (g_locale.id != 0 ? d.replace(g, "www") : null)], [0, "Espa" + String.fromCharCode(241) + "ol", (g_locale.id != 6 ? d.replace(g, "es") : null)], [0, "Fran" + String.fromCharCode(231) + "ais", (g_locale.id != 2 ? d.replace(g, "fr") : null)], [0, String.fromCharCode(1056, 1091, 1089, 1089, 1082, 1080, 1081), (g_locale.id != 8 ? d.replace(g, "ru") : null)]]; //c.menu = [[0, "Deutsch", (g_locale.id != 3 ? d.replace(g, "de") : null)], [0, "English", (g_locale.id != 0 ? d.replace(g, "www") : null)], [0, "Espa" + String.fromCharCode(241) + "ol", (g_locale.id != 6 ? d.replace(g, "es") : null)], [0, "Fran" + String.fromCharCode(231) + "ais", (g_locale.id != 2 ? d.replace(g, "fr") : null)], [0, String.fromCharCode(1056, 1091, 1089, 1089, 1082, 1080, 1081), (g_locale.id != 8 ? d.replace(g, "ru") : null)]];
var rel = d.match(/()\?((item|quest|spell|achievement|npc|object)=([0-9]+))/);
rel = rel[2] || "";
c.menu = [ c.menu = [
[0, "Deutsch", (g_locale.id != 3 ? "?locale=3" : null)], [0, "Deutsch", (g_locale.id != 3 ? "?locale=3" : null), , {rel: rel + " domain=de"}],
[0, "English", (g_locale.id != 0 ? "?locale=0" : null)], [0, "English", (g_locale.id != 0 ? "?locale=0" : null), , {rel: rel + " domain=en"}],
[0, "Espa" + String.fromCharCode(241) + "ol", (g_locale.id != 6 ? "?locale=6" : null)], [0, "Espa" + String.fromCharCode(241) + "ol", (g_locale.id != 6 ? "?locale=6" : null), , {rel: rel + " domain=es"}],
[0, "Fran" + String.fromCharCode(231) + "ais", (g_locale.id != 2 ? "?locale=2" : null)], [0, "Fran" + String.fromCharCode(231) + "ais", (g_locale.id != 2 ? "?locale=2" : null), , {rel: rel + " domain=fr"}],
[0, String.fromCharCode(1056, 1091, 1089, 1089, 1082, 1080, 1081), (g_locale.id != 8 ? "?locale=8" : null)]]; [0, String.fromCharCode(1056, 1091, 1089, 1089, 1082, 1080, 1081), (g_locale.id != 8 ? "?locale=8" : null), , {rel: rel + " domain=ru"}]
];
c.menu.rightAligned = 1; c.menu.rightAligned = 1;
if (g_locale.id != 25) { if (g_locale.id != 25) {
c.menu[{ c.menu[{
@@ -2120,6 +2125,7 @@ function g_getLocaleFromDomain(a) {
return (c[a] ? c[a] : 0) return (c[a] ? c[a] : 0)
} }
g_getLocaleFromDomain.L = { g_getLocaleFromDomain.L = {
www: 0,
fr: 2, fr: 2,
de: 3, de: 3,
es: 6, es: 6,
@@ -3246,10 +3252,12 @@ var Menu = {
if (R.newWindow) { if (R.newWindow) {
V.target = "_blank" V.target = "_blank"
} }
if (R.className) { if (R.className) {
T.className += " "+R.className T.className += " "+R.className
} }
if (R[4] != null && R[4].rel) {
V.rel = R[4].rel
}
if (R[4] != null && R[4].className) { if (R[4] != null && R[4].className) {
T.className += " "+R[4].className T.className += " "+R[4].className
} }
@@ -9599,8 +9607,12 @@ Listview.templates = {
if (a.reqclass) { if (a.reqclass) {
var b = Listview.funcBox.assocBinFlags(a.reqclass, g_chr_classes); var b = Listview.funcBox.assocBinFlags(a.reqclass, g_chr_classes);
var c = b[0]; var c = b[0];
var d = $("<a>").css("background-image", 'url("' + g_staticUrl + "/images/wow/icons/tiny?class_" + g_file_classes[c] + '.gif")').addClass("icontiny").addClass("c" + c).attr("href", "?class=" + c).text(g_chr_classes[c]); var d = ce("a");
$(e).append(d) d.style.backgroundImage = 'url("' + g_staticUrl + "/images/wow/icons/tiny?class_" + g_file_classes[c] + '.gif")';
d.className = "icontiny c" + c;
d.href = "?class=" + c;
ae(d, ct(g_chr_classes[c]));
ae(e, d);
} }
}, },
sortFunc: function (d, c, e) { sortFunc: function (d, c, e) {
@@ -12742,14 +12754,14 @@ var LiveSearch = new function () {
var var
currentTextbox, currentTextbox,
lastSearch = {}, lastSearch = {},
lastDiv, lastDiv,
timer, timer,
prepared, prepared,
container, container,
cancelNext, cancelNext,
hasData, hasData,
summary, summary,
selection, selection,
LIVESEARCH_DELAY = 500; LIVESEARCH_DELAY = 500;
function setText(textbox, txt) { function setText(textbox, txt) {

View File

@@ -2610,6 +2610,7 @@ var LANG = {and:" y ",
mapper_relevantlocs:"Lugares relevantes", mapper_relevantlocs:"Lugares relevantes",
mapper_entiretyinzone:"La misión al completo transcurre en $$", mapper_entiretyinzone:"La misión al completo transcurre en $$",
mapper_happensin:"Esta misión ocurre en $$.", mapper_happensin:"Esta misión ocurre en $$.",
mapper_objectives:{
ox:"Esta misión tiene objetivos en $$.", ox:"Esta misión tiene objetivos en $$.",
sx:"Esta misión comienza en $$.", sx:"Esta misión comienza en $$.",
ex:"Esta misión acaba en $$.", ex:"Esta misión acaba en $$.",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long