From 3eca73789869df23a50920e0d5f884bc6196c497 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 14 Jul 2014 15:13:23 -0400
Subject: [PATCH 1/2] BUG_13887 Permite eliminacion del lenguaje actual.

El lengujae actual podia ser borrado.
El lenguaje por defecto 'en' tambien podia ser borrado.

Se agrego validaciones para que el lenguaje por defecto de PM (en) no sea eliminado jamas y tambien para que el lenguaje que se esta usando actualmente tampoco sea eliminado.
---
 .../engine/methods/setup/language_Ajax.php    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php
index c645ff3a3..b30a0488a 100755
--- a/workflow/engine/methods/setup/language_Ajax.php
+++ b/workflow/engine/methods/setup/language_Ajax.php
@@ -152,17 +152,28 @@ try {
             $oContent = new Content();
             $aRow = $oDataset->getRow();
 
-            //THERE IS NO ANY CASE STARTED FROM THES LANGUAGE
-            if ($aRow[0] == 0) { //so we can delete this language
-                try {
-                    Content::removeLanguageContent( $locale );
-                    $trn->removeTranslationEnvironment( $locale );
-                    echo G::LoadTranslation( 'ID_LANGUAGE_DELETED_SUCCESSFULLY' );
-                } catch (Exception $e) {
-                    echo $e->getMessage();
-                }
+            $actualLanguage = $_ENV['REQUEST_URI'];
+            $actualLanguage = explode("/", $actualLanguage);
+
+            if($locale != "en"){ //Default Lengage 'en'
+            	if($locale != $actualLanguage[2]){ //Current lenguage
+            		//THERE IS NO ANY CASE STARTED FROM THES LANGUAGE
+            		if ($aRow[0] == 0) { //so we can delete this language
+            			try {
+            				Content::removeLanguageContent( $locale );
+            				$trn->removeTranslationEnvironment( $locale );
+            				echo G::LoadTranslation( 'ID_LANGUAGE_DELETED_SUCCESSFULLY' );
+            			} catch (Exception $e) {
+            				echo $e->getMessage();
+            			}
+            		} else {
+            			echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE' ) );
+            		}
+            	} else {
+            		echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE_CURRENTLY' ) );
+            	}
             } else {
-                echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE' ) );
+            	echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE_DEFAULT' ) );
             }
             break;
     }

From 37c9f9d3606271e136595a5c22e1b79d1cc8dc23 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Tue, 15 Jul 2014 15:35:44 -0400
Subject: [PATCH 2/2] BUG_13887 Permite eliminacion del lenguaje actual.

El lenguaje actual podia ser borrado.
El lenguaje por defecto 'en' tambien podia ser borrado.

Se agrego validaciones para que el lenguaje por defecto de PM (en) no sea eliminado jamas y tambien para que el lenguaje que se esta usando actualmente tampoco sea eliminado.
---
 workflow/engine/methods/setup/language_Ajax.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php
index b30a0488a..3bb445ee6 100755
--- a/workflow/engine/methods/setup/language_Ajax.php
+++ b/workflow/engine/methods/setup/language_Ajax.php
@@ -152,11 +152,8 @@ try {
             $oContent = new Content();
             $aRow = $oDataset->getRow();
 
-            $actualLanguage = $_ENV['REQUEST_URI'];
-            $actualLanguage = explode("/", $actualLanguage);
-
             if($locale != "en"){ //Default Lengage 'en'
-            	if($locale != $actualLanguage[2]){ //Current lenguage
+            	if($locale != SYS_LANG){ //Current lenguage
             		//THERE IS NO ANY CASE STARTED FROM THES LANGUAGE
             		if ($aRow[0] == 0) { //so we can delete this language
             			try {