Mercurial > hg > lukkari

changeset 184:04490fe590ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup translation code and translations.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 30 Sep 2015 09:39:32 +0300
parents dda30eff3266
children 111b062d3988
files index.php
diffstat 1 files changed, 71 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/index.php	Wed Sep 30 08:39:24 2015 +0300
+++ b/index.php	Wed Sep 30 09:39:32 2015 +0300
@@ -32,47 +32,44 @@
 );
 
 $pageTranslations = array(
-  "Original" => array("fi" => "Alkuperäinen"),
-
-  "Shown" => array("fi" => "Näkyvillä"),
-  "Next period" => array("fi" => "Seuraava periodi"),
-  "Current period" => array("fi" => "Nykyinen periodi"),
-  "Switch" => array("fi" => "Vaihda"),
-
-  "contact" => array(
-    "en" => "Contact <b>%1</b> or <b>%2</b>. ".
-    "The author can't be held responsible for any errors or inaccuracies in the data!",
+  "change" => array(
+    "fi" => "Vaihda",
+    "en" => "Change",
+  ),
 
-    "fi" => "Yhteydenotot <b>%1</b> tai <b>%2</b>. ".
-    "En vastaa mahdollisista virheistä tai epätarkkuuksista tiedoissa!",
+  "period_shown" => array(
+    "fi" => "Näkyvillä",
+    "en" => "Shown",
+  ),
+  "next_period" => array(
+    "fi" => "Seuraava periodi",
+    "en" => "Next period",
   ),
-  
-  "updated" => array(
-    "en" => "Last updated: <b>%1</b>.",
-    "fi" => "Päivitetty: <b>%1</b>.",
+  "current_period" => array(
+    "fi" => "Nykyinen periodi",
+    "en" => "Current period",
   ),
-  
-  "beta" => array(
-    "en" => " NOTICE! %2 v%1 is still under development. There may be bugs.",
-    "fi" => " HUOM! %2 v%1 on vielä kehityksen alla. Bugeja voi löytyä.",
+  "expl_toggle_period" => array(
+    "fi" => "Vaihda nykyisen ja seuraavan periodin (jos saatavilla) lukujärjestyksen välillä.",
+    "en" => "Switch view between current and next period (if available) timetable.",
   ),
 
   "viikossa" => array(
+    "fi" => "Viikossa yhteensä <b>%1</b> tuntia.",
     "en" => "Total of <b>%1</b> hours in the week.",
-    "fi" => "Viikossa yhteensä <b>%1</b> tuntia.",
   ),
 
   "vuoroviikoin" => array(
+    "fi" => "Vuoroviikoin",
     "en" => "Every other week",
-    "fi" => "Vuoroviikoin",
   ),
 
-  "classNotSet" => array(
+  "class_not_set" => array(
+    "fi" => "Luokkaa ei asetettu, käytetään vakioarvoa <b>%1</b>.",
     "en" => "Class not set, using default <b>%1</b>.",
-    "fi" => "Luokkaa ei asetettu, käytetään vakioarvoa <b>%1</b>.",
   ),
 
-  "classDataNotFound" => array(
+  "class_data_not_found" => array(
     "fi" => "Luokan %1 tietoja ei löytynyt! Jos luokkakoodi on uusi, ".
     "ilmestyy se järjestelmään seuraavan päivityksen aikana. Luokkatiedot ".
     "päivitetään noin kerran viikossa. <b>On myös mahdollista, että luokkakoodi ".
@@ -84,39 +81,69 @@
     "exists for next period's data.</b>",
   ),
   
-  "classListNotFound" => array(
+  "class_list_not_found" => array(
     "fi" => "Luokkien listaa ei löytynyt. Kokeile ladata sivu uudelleen hetken kuluttua.",
     "en" => "Class list not found. An update may be in progress, try reloading in a minute.",
   ),
   
-  "classFormatError" => array(
+  "class_format_error" => array(
     "fi" => "Virhe! Luokan täytyy olla muotoa <b>XXXnXXX</b>, käytetään vakioarvoa <b>%1</b>.",
     "en" => "Error! Class code must be of format <b>XXXnXXX</b>, using default value of <b>%1</b>.",
   ),
 
-  "Style" => array(
+  "change_style" => array(
     "fi" => "Tyyli",
+    "en" => "Style",
   ),
 
-  "linkToggle" => array(
-    "fi" => "Vaihda nykyisen ja seuraavan periodin (jos saatavilla) lukujärjestyksen välillä.",
-    "en" => "Switch view between current and next period (if available) timetable.",
+  "link_original_data" => array(
+    "fi" => "Alkuperäinen",
+    "en" => "Original",
   ),
 
-  "linkOrig" => array(
+  "expl_link_original_data" => array(
     "fi" => "Linkki alkuperäiseen lukujärjestysdataan.",
     "en" => "Link to the original time table data.",
   ),
   
-  "linkMobile" => array(
+  "link_mobile_version" => array(
+    "en" => "Mobile",
+    "fi" => "Mobile",
+  ),
+  
+  "expl_link_mobile_version" => array(
     "fi" => "Yksinkertaisempi mobiililaiteversio lukujärjestyksestä.",
     "en" => "Simpler mobile device version of the timetable.",
   ),
   
-  "linkCurrLuk" => array(
+  "link_current_settings" => array(
+    "fi" => "Linkki",
+    "en" => "Link",
+  ),
+  
+  "expl_link_current_settings" => array(
     "fi" => "Linkki tähän lukujärjestykseen nykyisillä asetuksilla (kieli, jne.)",
     "en" => "Link to the this timetable with current settings (language, etc.)",
   ),
+
+  "contact" => array(
+    "fi" => "Yhteydenotot <b>%1</b> tai <b>%2</b>. ".
+    "En vastaa mahdollisista virheistä tai epätarkkuuksista tiedoissa!",
+
+    "en" => "Contact <b>%1</b> or <b>%2</b>. ".
+    "The author can't be held responsible for any errors or inaccuracies in the data!",
+  ),
+  
+  "updated" => array(
+    "fi" => "Päivitetty: <b>%1</b>.",
+    "en" => "Last updated: <b>%1</b>.",
+  ),
+  
+  "beta" => array(
+    "fi" => " HUOM! %2 v%1 on vielä kehityksen alla. Bugeja voi löytyä.",
+    "en" => " NOTICE! %2 v%1 is still under development. There may be bugs.",
+  ),
+
 //  "" => array("fi" => ),
 );
 
@@ -140,7 +167,7 @@
     $id = $m[1];
     return TRUE;
   } else {
-    stError(cmQM("classFormatError", $classDefaultID));
+    stError(cmQM("class_format_error", $classDefaultID));
     $id = $classDefaultID;
     return FALSE;
   }
@@ -484,7 +511,7 @@
 }
 else
 {
-  stError(cmQM("classNotSet", $classDefaultID));
+  stError(cmQM("class_not_set", $classDefaultID));
   $classID = $classDefaultID;
 }
 
@@ -525,14 +552,14 @@
 
 // Read classfile
 if (($classIDs = lukReadClassFile($classIDFile[$nextPeriod])) === false)
-  stError(cmQM("classListNotFound"));
+  stError(cmQM("class_list_not_found"));
 
 
 // Read class data
 $dataFile = $cachePath.$classID.".data";
 if (!file_exists($dataFile))
 {
-  stError(cmQM("classDataNotFound", chentities($classID)));
+  stError(cmQM("class_data_not_found", chentities($classID)));
   $haveData = FALSE;
   $timestamp = time();
 }
@@ -619,25 +646,25 @@
 echo 
   "    </select>\n".
   "   </th>\n".
-  "   <th><input class=\"submit\" type=\"submit\" value=\"".cmQM("Switch")."\" /></th>\n";
+  "   <th><input class=\"submit\" type=\"submit\" value=\"".cmQM("change")."\" /></th>\n";
 
 if (!$mobileMode)
 {
   echo
     "   <th><a id=\"next\" class=\"textctrl\" href=\"".
-    $baseURI.($nextPeriod ? "" : "?next")."\" title=\"".cmQM("linkToggle")."\">".
-    cmQM("Shown").": ".($nextPeriod ? cmQM("Next period") : cmQM("Current period")).
+    $baseURI.($nextPeriod ? "" : "?next")."\" title=\"".cmQM("expl_toggle_period")."\">".
+    cmQM("period_shown").": ".($nextPeriod ? cmQM("next_period") : cmQM("current_period")).
     "</a></th>\n";
   
   if ($haveData)
   {
     echo
-    "   <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$classID.$origBaseExt."\" title=\"".cmQM("linkOrig")."\">".cmQM("Original")."</a></th>\n";
+    "   <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$classID.$origBaseExt."\" title=\"".cmQM("expl_link_original_data")."\">".cmQM("link_original_data")."</a></th>\n";
     //"   <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$luokka.".xml\">XML</a></th>\n";
   }
   
   echo
-    "   <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\" title=\"".cmQM("linkMobile")."\">Mobile</a></th>\n";
+    "   <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\" title=\"".cmQM("expl_link_mobile_version")."\">".cmQM("link_mobile_version")."</a></th>\n";
 }
 
 $currURL = $baseURI."?luokka=".$classID."&amp;lang=".$pageLang.
@@ -645,7 +672,7 @@
   ($nextPeriod ? "&amp;next" : "");
 
 echo
-  "   <th><a href=\"".$currURL."\" class=\"textctrl\" title=\"".cmQM("linkCurrLuk")."\">Link</a></th>\n".
+  "   <th><a href=\"".$currURL."\" class=\"textctrl\" title=\"".cmQM("expl_link_current_settings")."\">".cmQM("link_current_settings")."</a></th>\n".
 //  "   <th class=\"advert\"><a href=\"http://tnsp.org/u/G1X\"><img src=\"img/hdd_fi.gif\" alt=\"HDD.fi\" /></a></th>\n".
   "   <th class=\"advert\"><a href=\"http://tnsp.org/u/H9w\"><img src=\"img/batmud.png\" alt=\"BatMUD\" /></a></th>\n".
 //  "   <th><a href=\"http://tnsp.org/testluk/\"><img src=\"img/test.png\" alt=\"Lukkari v3\" /></a></th>\n".