Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on tests

Browse Source
This commit is contained in:
Hillel Coren 2017-01-10 12:41:07 +02:00
parent 9400c073e2
commit 494ddc4bf1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,7 +6,7 @@ php:
# - 5.5.9 # - 5.5.9
# - 5.6 # - 5.6
# - 5.6 # - 5.6
- 7.0 # - 7.0
- 7.1 - 7.1
# - hhvm # - hhvm

6
app/Libraries/Constants.php
View File

@ -542,12 +542,13 @@ if (!defined('CONTACT_EMAIL'))
function uctrans($text) function uctrans($text)
{ {
return ucwords(trans($text)); //return ucwords(trans($text));
} }
// optional trans: only return the string if it's translated // optional trans: only return the string if it's translated
function otrans($text) function otrans($text)
{ {
/*
$locale = Session::get(SESSION_LOCALE); $locale = Session::get(SESSION_LOCALE);
if ($locale == 'en') { if ($locale == 'en') {
@ -557,11 +558,13 @@ if (!defined('CONTACT_EMAIL'))
$english = trans($text, [], 'en'); $english = trans($text, [], 'en');
return $string != $english ? $string : ''; return $string != $english ? $string : '';
} }
*/
} }
// include modules in translations // include modules in translations
function mtrans($entityType, $text = false) function mtrans($entityType, $text = false)
{ {
/*
if ( ! $text) { if ( ! $text) {
$text = $entityType; $text = $entityType;
} }
@ -576,5 +579,6 @@ if (!defined('CONTACT_EMAIL'))
} }
return trans("texts.{$text}"); return trans("texts.{$text}");
*/
} }
} }