Changeset 593 for trunk

Timestamp:

Nov 21, 2013, 3:45:51 PM (11 years ago)

Author:

maron

Message:

Oprava a vylepšení provázanosti textů. Hledání názvů míst a osob a jiných v textech výprav a podobných.

Location:

trunk

Files:

• Modules/Dictionary/Dictionary.php (modified) (1 diff)
• Modules/Translation/Form.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)
• style/style.css (modified) (1 diff)

trunk/Modules/Dictionary/Dictionary.php

@@ -49 +49 @@
     'TextAreaTriggerTavern' => 'Name',
     'Dictionary' => 'Text',
+    'TextArea' => 'Name',
+    'TextAreaPOI' => 'Name',
+    'TextCharacterClass' => 'Name',
+    'TextCharacterRace' => 'Name1',
+    'TextItemSubClass' => 'Name',
+    'TextCreatureType' => 'Name',
   );
 
-  $buff = GetTranslatNames($Text,$mode,$TablesColumn);
+  $buff = GetTranslatNames($Text,$mode,GetTranslatNamesArray());
   
    // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);

trunk/Modules/Translation/Form.php

@@ -8 +8 @@
                 foreach($names as $Line) {
                         if ($Line[3] <> '') {
-                                $Text = str_replace($Line[2],'<span Title="Byl nalezen překlad: '.$Line[3].'" class="edit">'.$Line[2].'</span>',$Text);
-                                $Text = str_replace(strtolower($Line[2]),'<span Title="Byl nalezen překlad: '.$Line[3].'" class="edit">'.$Line[2].'</span>',$Text);
+                          if (strpos($Text, '>'.$Line[2]) == 0)
+                                  $Text = str_replace($Line[2],'<span Title="Přelož jako: '.$Line[3].'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
+                                if (strpos($Text, '>'.$Line[2]) == 0)
+          $Text = str_replace(strtolower($Line[2]),'<span Title="Překládej jako: '.$Line[3].'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
                         } else {
-                                $Text = str_replace($Line[2],'<span title="Jméno bylo nalezeno v názvech a můžete ho přeložit. Začnete kliknutím na: Vyhledat v názvech" class="edit">'.$Line[2].'</span>',$Text);
-                                $Text = str_replace(strtolower($Line[2]),'<span title="Jméno bylo nalezeno v názvech a můžete ho přeložit. Začnete kliknutím na: Vyhledat v názvech" class="edit">'.$Line[2].'</span>',$Text);
+                          if (strpos($Text, '>'.$Line[2]) == 0)
+                                $Text = str_replace($Line[2],'<span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
+                                if (strpos($Text, '>'.$Line[2]) == 0)
+          $Text = str_replace(strtolower($Line[2]),'<span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
                         }
                 }
@@ -185 +189 @@
                                         if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
                                                 //<span class="edit">barvou.</span>
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextCreature' => 'name'));
+                                                $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
                                         } else {
                                                 $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 590; // Subversion revision
+$Revision = 591; // Subversion revision
 $DatabaseRevision = 585; // Database structure revision 
 $ReleaseTime = '2013-11-21';

trunk/includes/global.php

@@ -481 +481 @@
   }
 }
-
+function GetTranslatNamesArray() {  
+
+$TablesColumn = array
+  (
+    'TextGameObject' => 'Name',
+    'TextCreature' => 'name',
+    'TextItem' => 'Name',
+    'TextTransport' => 'Name',
+    'TextAreaTriggerTeleport' => 'Name',
+    'TextAreaTriggerTavern' => 'Name',
+    'Dictionary' => 'Text',
+    'TextArea' => 'Name',
+    'TextAreaPOI' => 'Name',
+    'TextCharacterClass' => 'Name',
+    'TextCharacterRace' => 'Name1',
+    'TextItemSubClass' => 'Name',
+    'TextCreatureType' => 'Name',
+  );
+  return($TablesColumn);
+}
 function GetTranslatNames($Text,$mode,$TablesColumn) 
 {

trunk/style/style.css

@@ -164 +164 @@
 .edit
 {
+  color: #362b27;
   background-color: #DB7093;
+  text-decoration: none;
+}
+
+.edit:visited
+{
+  color: #362b27;
+  background-color: #DB7093;
+  text-decoration: none;
+}
+.edit:hover
+{
+  color: #362b27;
+  background-color: #DB7093;
+  text-decoration: none;
+}
+
+.needtran
+{
+  color: #362b27;
+  background-color: #D0D0D0;
+  text-decoration: none;
+}
+.needtran:visited
+{
+  color: #362b27;
+  background-color: #D0D0D0;
+  text-decoration: none;
+}
+.needtran:hover
+{
+  color: #362b27;
+  background-color: #D0D0D0;
+  text-decoration: none;
 }