diff --git a/include/CheckoutPage.php b/include/CheckoutPage.php index e209b81..f72af55 100644 --- a/include/CheckoutPage.php +++ b/include/CheckoutPage.php @@ -32,7 +32,8 @@ class CheckoutPage extends Page { $this->ldap->get_user($name); $nameuser = User::create_user($name); } catch(Exception $le) { - $err = "Användarnamnet '$name' kunde inte hittas."; + $err = i18n("Username {name} not found.", + $name); throw new Exception($err); } } @@ -47,13 +48,14 @@ class CheckoutPage extends Page { $emailuser = new User($this->ldap->search_email($search), 'name'); } catch(Exception $ue) { - $err = "E-postadressen '$search' kunde inte hittas."; + $err = i18n('Email address {address} not found.', + $search); throw new Exception($err); } } if($nameuser && $emailuser) { if($nameuser != $emailuser) { - $err = "Användarnamn och e-post matchar olika användare."; + $err = i18n('Username and email match different users.'); throw new Exception($err); } return $nameuser; @@ -81,11 +83,11 @@ class CheckoutPage extends Page { $enddate = format_date(default_loan_end(time())); $disabled = ''; $loans = $this->user->get_loans('active'); - $loan_table = 'Inga pågående lån.'; + $loan_table = i18n('No active loans.'); if($loans) { $loan_table = $this->build_user_loan_table($loans); } - $subhead = replace(array('title' => 'Lånade artiklar'), + $subhead = replace(array('title' => i18n('Borrowed products')), $this->fragments['subtitle']); } print(replace(array('user' => $username, diff --git a/include/SearchPage.php b/include/SearchPage.php index 1d47bf3..2fc313c 100644 --- a/include/SearchPage.php +++ b/include/SearchPage.php @@ -12,7 +12,7 @@ class SearchPage extends Page { } $this->terms = $this->translate_terms($_GET); if($this->terms) { - $this->subtitle = 'Sökresultat'; + $this->subtitle = i18n('Search results'); $hits = $this->do_search(); if(isset($hits['product'])) { $this->product_hits = $hits['product']; @@ -182,7 +182,7 @@ class SearchPage extends Page { $this->fragments['search_term']); } } - $prod_table = 'Inga artiklar hittade.'; + $prod_table = i18n('No products found.'); if($this->product_hits) { $products = ''; foreach($this->product_hits as $hit) { @@ -192,7 +192,7 @@ class SearchPage extends Page { 'type' => 'double'), $this->fragments['product_table']); } - $user_table = 'Inga användare hittade.'; + $user_table = i18n('No users found.'); if($this->user_hits) { $users = array(); foreach($this->user_hits as $hit) { diff --git a/include/User.php b/include/User.php index 9d15791..0792fde 100644 --- a/include/User.php +++ b/include/User.php @@ -107,7 +107,7 @@ class User extends Entity { try { return $ldap->get_user($this->name); } catch(Exception $e) { - return 'Ej i SUKAT'; + return i18n('Not in SUKAT'); } } @@ -116,7 +116,7 @@ class User extends Entity { return $ldap->get_user_email($this->name); } catch(Exception $e) { if($format) { - return 'Mailadress saknas'; + return i18n('Email address missing'); } return false; } diff --git a/include/translations.php b/include/translations.php index 7ed6dd7..c3e8ac3 100644 --- a/include/translations.php +++ b/include/translations.php @@ -221,6 +221,58 @@ $i18n = array( "en" => function() { return "Borrower details"; }, "sv" => function() { return "Låntagardetaljer"; }, ), + "Search results" => array( + "en" => function() { return "Search results"; }, + "sv" => function() { return "Sökresultat"; }, + ), + "No products found." => array( + "en" => function() { return "No products found."; }, + "sv" => function() { return "Inga artiklar hittade."; }, + ), + "No users found." => array( + "en" => function() { return "No users found."; }, + "sv" => function() { return "Inga användare hittade."; }, + ), + "Email address missing" => array( + "en" => function() { return "Email address missing"; }, + "sv" => function() { return "Mailadress saknas"; }, + ), + "Not in SUKAT" => array( + "en" => function() { return "Not in SUKAT"; }, + "sv" => function() { return "Ej i SUKAT"; }, + ), + "Username {name} not found." => array( + "en" => function($name) { + return "Username $name not found."; + }, + "sv" => function($name) { + return "Användarnamnet $name kunde inte hittas."; + }, + ), + "Email address {address} not found." => array( + "en" => function($address) { + return "Email address '$address' not found."; + }, + "sv" => function($address) { + return "E-postadressen '$address' kunde inte hittas."; + }, + ), + "Username and email match different users." => array( + "en" => function() { + return "Username and email match different users."; + }, + "sv" => function() { + return "Användarnamn och e-post matchar olika användare."; + }, + ), + "No active loans." => array( + "en" => function() { return "No active loans."; }, + "sv" => function() { return "Inga pågående lån."; }, + ), + "Borrowed products" => array( + "en" => function() { return "Borrowed products"; }, + "sv" => function() { return "Lånade artiklar"; }, + ), /* "" => array( "en" => function() { return ""; },