From 77ffbf1ff074829d17c4217a354efc752461c5e2 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Mon, 4 Jun 2012 17:08:14 -0400 Subject: [PATCH 1/2] =?UTF-8?q?BUG=209167=20Error=20en=20gram=C3=A1ca=20al?= =?UTF-8?q?=20desplegarse=20mensaje=20de=20error=20en=20SOLVED?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - we've found grammatical errors and some hardcoded texts - we've created new labels for these ID_SKIN_EXCEPTION Skin Engine Exception ID_SKIN_LAYOUT_NOT_FOUND Layout not Found ID_SKIN_INCORRECT_VERIFY_URL You're trying to get a resource from an incorrect skin, please verify your url. ID_REDIRECT_URL The System can try to redirect to the correct url. Try Now. --- workflow/engine/skinEngine/skinEngine.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 735119f7b..3905cedaa 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -162,20 +162,20 @@ class SkinEngine switch ($e->getCode()) { case SE_LAYOUT_NOT_FOUND: - $data['exception_type'] = 'Skin Engine Exception'; - $data['exception_title'] = 'Layout not Found'; - $data['exception_message'] = 'You\'re trying to get a resource from a incorrent skin, please verify you url.'; - $data['exception_list'] = array(); + $data['exception_type'] = G::loadTranslation('ID_SKIN_EXCEPTION'); + $data['exception_title'] = G::loadTranslation('ID_SKIN_LAYOUT_NOT_FOUND'); + $data['exception_message'] = G::loadTranslation('ID_SKIN_INCORRECT_VERIFY_URL'); + $data['exception_list'] = array(); if (substr($this->mainSkin, 0, 2) != 'ux') { $url = '../login/login'; } else { - $url = '../main/login'; + $url = '../main/login'; } $link = 'Try Now'; - $data['exception_notes'][] = ' The System can try redirect to correct url. ' . $link; + $data['exception_notes'][] = G::loadTranslation('ID_REDIRECT_URL'). $link; G::renderTemplate(PATH_TPL . 'exception', $data); break; From 07f22113e2e00aede887f0c5119b425f2c55ac0d Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 5 Jun 2012 16:35:29 -0400 Subject: [PATCH 2/2] =?UTF-8?q?BUG=209167=20Error=20en=20gram=C3=A1ca=20al?= =?UTF-8?q?=20desplegarse=20mensaje=20de=20error=20en=20SOLVED?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Change loadTranslation to LoadTranslation --- workflow/engine/skinEngine/skinEngine.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 3905cedaa..e615133c3 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -162,9 +162,9 @@ class SkinEngine switch ($e->getCode()) { case SE_LAYOUT_NOT_FOUND: - $data['exception_type'] = G::loadTranslation('ID_SKIN_EXCEPTION'); - $data['exception_title'] = G::loadTranslation('ID_SKIN_LAYOUT_NOT_FOUND'); - $data['exception_message'] = G::loadTranslation('ID_SKIN_INCORRECT_VERIFY_URL'); + $data['exception_type'] = G::LoadTranslation('ID_SKIN_EXCEPTION'); + $data['exception_title'] = G::LoadTranslation('ID_SKIN_LAYOUT_NOT_FOUND'); + $data['exception_message'] = G::LoadTranslation('ID_SKIN_INCORRECT_VERIFY_URL'); $data['exception_list'] = array(); if (substr($this->mainSkin, 0, 2) != 'ux') { $url = '../login/login'; @@ -175,7 +175,7 @@ class SkinEngine $link = 'Try Now'; - $data['exception_notes'][] = G::loadTranslation('ID_REDIRECT_URL'). $link; + $data['exception_notes'][] = G::LoadTranslation('ID_REDIRECT_URL'). $link; G::renderTemplate(PATH_TPL . 'exception', $data); break;