From 813751ac7a0e3f17af791397fa7e6b60d526f0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Mon, 25 Nov 2013 21:07:08 +0100
Subject: [PATCH] language cleanup

---
 includes/model/Sprache_model.php | 24 ---------------------
 includes/sys_menu.php            |  2 +-
 includes/view/Sprache_view.php   | 36 --------------------------------
 public/index.php                 |  2 --
 4 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 includes/model/Sprache_model.php
 delete mode 100644 includes/view/Sprache_view.php

diff --git a/includes/model/Sprache_model.php b/includes/model/Sprache_model.php
deleted file mode 100644
index 0b18dbca..00000000
--- a/includes/model/Sprache_model.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Load a string by key.
- *
- * @param string $textid
- * @param string $sprache
- */
-function Sprache($textid, $sprache) {
-  $sprache_source = sql_select("
-      SELECT *
-      FROM `Sprache`
-      WHERE `TextID`='" . sql_escape($textid) . "'
-      AND `Sprache`='" . sql_escape($sprache) . "'
-      LIMIT 1
-      ");
-  if ($sprache_source === false)
-    return false;
-  if (count($sprache_source) == 1)
-    return $sprache_source[0];
-  return null;
-}
-
-?>
\ No newline at end of file
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 3cd42539..db9a6888 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -83,7 +83,7 @@ function make_navigation_for($name, $pages) {
   $menu = "";
   foreach ($pages as $page)
     if (in_array($page, $privileges) || in_array($page, $specials))
-      $menu .= '<li' . ($page == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($page) . '">' . Get_Text($page) . '</a></li>';
+      $menu .= '<li' . ($page == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($page) . '">' . $title . '</a></li>';
   
   if ($menu != "")
     $menu = '<nav class="container"><h4>' . $name . '</h4><ul class="content">' . $menu . '</ul></nav>';
diff --git a/includes/view/Sprache_view.php b/includes/view/Sprache_view.php
deleted file mode 100644
index 88c7435c..00000000
--- a/includes/view/Sprache_view.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Names of available languages.
- */
-$languages = array (
-  'DE' => "Deutsch",
-  'EN' => "English"
-);
-
-/**
- * Display acutual translation of given text id.
- * @param string $TextID
- * @param bool $NoError
- * @return string
- */
-function Get_Text($TextID, $NoError = false) {
-  global $debug;
-
-  if (!isset ($_SESSION['Sprache']))
-    $_SESSION['Sprache'] = "EN";
-  if ($_SESSION['Sprache'] == "")
-    $_SESSION['Sprache'] = "EN";
-  if (isset ($_GET["SetLanguage"]))
-    $_SESSION['Sprache'] = $_GET["SetLanguage"];
-
-  $sprache_source = Sprache($TextID, $_SESSION['Sprache']);
-  if($sprache_source === false)
-    engelsystem_error("Unable to load text key.");
-  if($sprache_source == null) {
-    if($NoError && !$debug)
-      return "";
-    return $TextID;
-  }
-  return $sprache_source['Text'];
-}
-?>
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index e8b8b3a1..35c0934d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -11,11 +11,9 @@ require_once ('includes/sys_page.php');
 require_once ('includes/sys_template.php');
 
 require_once ('includes/model/LogEntries_model.php');
-require_once ('includes/model/Sprache_model.php');
 require_once ('includes/model/User_model.php');
 
 require_once ('includes/view/Shifts_view.php');
-require_once ('includes/view/Sprache_view.php');
 require_once ('includes/view/User_view.php');
 
 require_once ('includes/helper/internationalization_helper.php');