Changeset 746

Timestamp:

Jan 10, 2014, 11:06:39 PM (11 years ago)

Author:

maron

Message:

• Added: in addon version 1.12.1 translate NPC action text and title quest text in NPC frame

Location:

trunk

Files:

• Modules/Export/files/1.12.1/CzWoW/CzWoW.lua (modified) (4 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)

trunk/Modules/Export/files/1.12.1/CzWoW/CzWoW.lua

@@ -5 +5 @@
 local old_ItemTextFrame_OnEvent;
 local old_ChatFrame_OnEvent;
-local old_GossipFrameOptionsUpdate;
+--local old_GossipFrameOptionsUpdate;
 local old_GossipFrameUpdate;
 local oldTooltipText;
@@ -260 +260 @@
 old_ItemTextFrame_OnEvent=ItemTextFrame_OnEvent;
 old_ChatFrame_OnEvent=ChatFrame_OnEvent;
-old_GossipFrameOptionsUpdate=GossipFrameOptionsUpdate;
+--old_GossipFrameOptionsUpdate=GossipFrameOptionsUpdate;
 old_GossipFrameUpdate=GossipFrameUpdate;
 
@@ -359 +359 @@
 end;
 
-GossipFrameOptionsUpdate=function(arg)
-if (arg ~= nil) then
-        if select("#", arg)>0 then
-                old_GossipFrameOptionsUpdate(arg);
+--NEW:delete
+GossipFrameOptionsUpdate_zaloha=function(par)
+if (par ~= nil) then
+    DEFAULT_CHAT_FRAME:AddMessage(par);
+    --  if select("#", par)>0 then
+--              old_GossipFrameOptionsUpdate(par);
+        
+        local titleButton;
+        local titleIndex = 1;
+        for i=1, arg.n, 2 do
+                if ( GossipFrame.buttonIndex > NUMGOSSIPBUTTONS ) then
+                        message("This NPC has too many quests and/or gossip options.");
+                end
+                titleButton = getglobal("GossipTitleButton" .. GossipFrame.buttonIndex);
+                titleButton:SetText(arg[i]);
+                GossipResize(titleButton);
+                titleButton:SetID(titleIndex);
+                titleButton.type="Gossip";
+                getglobal(titleButton:GetName() .. "GossipIcon"):SetTexture("Interface\\GossipFrame\\" .. arg[i+1] .. "GossipIcon");
+                GossipFrame.buttonIndex = GossipFrame.buttonIndex + 1;
+                titleIndex = titleIndex + 1;
+                titleButton:Show();
+        end
+
                 if CZWOW_EnableNPCs and type(CZWOW_NPCAction_count)=="number" then
-                        for i=1, NUMGOSSIPBUTTONS, 1 do
+                        for i=1, GossipFrame.buttonIndex, 1 do
+                                titleButton=getglobal("GossipTitleButton" .. i);
+        titleButton:SetText("test");
+                                local en=trim(titleButton:GetText());
+                                for i=1, CZWOW_NPCAction_count, 1 do
+                                        if type(getglobal("CZWOW_NPCAction_"..i))=="table" and getglobal("CZWOW_NPCAction_"..i)[en] then
+                                                titleButton:SetText(prepare(getglobal("CZWOW_NPCAction_"..i)[en]));
+                                                GossipResize(titleButton);
+                                        end
+                                end
+                        end
+                end
+--      end
+end
+end
+
+GossipFrameUpdate=function()
+        old_GossipFrameUpdate();
+        local cz=NPCTextTranslate(GossipGreetingText:GetText());
+        if cz then GossipGreetingText:SetText(cz) end
+  
+  
+  --NEW:
+                for i=1, GossipFrame.buttonIndex, 1 do
                                 titleButton=getglobal("GossipTitleButton" .. i);
                                 local en=trim(titleButton:GetText());
@@ -373 +416 @@
                                         end
                                 end
-                        end
-                end
-        end
-end
-end
-
-GossipFrameUpdate=function()
-        old_GossipFrameUpdate();
-        local cz=NPCTextTranslate(GossipGreetingText:GetText());
-        if cz then GossipGreetingText:SetText(cz) end
+                for i=1, CZWOW_QuestTitle_count, 1 do
+                        if type(getglobal("CZWOW_QuestTitle_"..i))=="table" and getglobal("CZWOW_QuestTitle_"..i)[en] then
+                                  titleButton:SetText(prepare(getglobal("CZWOW_QuestTitle_"..i)[en]));
+                            end
+        end
+                end
 end;
 

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 745; // Subversion revision
+$Revision = 746; // Subversion revision
 $DatabaseRevision = 732; // Database structure revision 
 $ReleaseTime = '2014-01-08';

trunk/includes/global.php

@@ -144 +144 @@
 
 function GetTranslateGoogle($text) {
-
+  global $System;
 //  $text = 'Balthule\'s letter is dire. This Cult of the Dark Strand is a thorn in my side that must be removed. I have been dealing with some of the Dark Strand scum northeast of here at Ordil\'Aran. One of their number possesses a soul gem that I believe holds the secret to the cult\'s power.$b$bBring it to me, and I will be able to decipher the secrets held within.';
  // $text = htmlspecialchars($text);
+  
+  $text = str_replace('$B','$B ',$text);
   $text = urlencode($text);
+ // $text = strtolower($text);
 //  $text = str_replace('&','',$text);
 //  $text = str_replace(' ','%20',$text);
- // $text = str_replace('$B','$B%20',$text);
-  $url = 'http://translate.google.cz/?sl=en&tl=cs&text='.$text;
+  if ($System->User->Language == 2)
+    $lang = 'sk';
+  else $lang = 'cs';
+  $url = 'http://translate.google.cz/?sl=en&tl='.$lang.'&text='.$text;
 
 
@@ -169 +174 @@
     $data = $partbefore.' '.$partafter;
   }
+  
+  $data = utf8_encode($data);
 
   $data = str_replace('$ ','$',$data);
+  $data = str_replace('$b $b','$b$b',$data);
   $data = str_replace('| ','|',$data);