From 503647fe5096d1f07d41573e33d1648ed8040e6e Mon Sep 17 00:00:00 2001 From: Ricardo Rodriguez Date: Wed, 6 Jan 2010 14:56:44 -0500 Subject: [PATCH 1/7] Add new terms to translate CT#444 --- main/lang/english/survey.inc.php | 1 + main/lang/english/userInfo.inc.php | 1 + main/lang/english/wiki.inc.php | 1 + main/lang/spanish/survey.inc.php | 1 + main/lang/spanish/trad4all.inc.php | 2 +- main/lang/spanish/userInfo.inc.php | 3 ++- main/lang/spanish/wiki.inc.php | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) mode change 100755 => 100644 main/lang/english/survey.inc.php mode change 100755 => 100644 main/lang/english/wiki.inc.php mode change 100755 => 100644 main/lang/spanish/survey.inc.php mode change 100755 => 100644 main/lang/spanish/wiki.inc.php diff --git a/main/lang/english/survey.inc.php b/main/lang/english/survey.inc.php old mode 100755 new mode 100644 index 30d886000e..27e0fb6204 --- a/main/lang/english/survey.inc.php +++ b/main/lang/english/survey.inc.php @@ -202,4 +202,5 @@ $BackToSurvey = "Back to survey"; $UpdateInformation = "Update information"; $PleaseFillSurvey = "Please fill survey"; $ReportingOverview = "Reporting overview"; +$ThereAreNotQuestionsForthisSurvey = "There are not questions for this survey"; ?> \ No newline at end of file diff --git a/main/lang/english/userInfo.inc.php b/main/lang/english/userInfo.inc.php index e8aa0a2a09..1c29b8fda9 100644 --- a/main/lang/english/userInfo.inc.php +++ b/main/lang/english/userInfo.inc.php @@ -188,4 +188,5 @@ $YouHaveReceivedANewMessageInTheGroupX = "You have received a new message in the $ClickHereToSeeMessageGroup = "Click here to see message group"; $OrCopyPasteTheFollowingUrl = "Or copy paste the following url"; $ThereIsANewMessageInTheGroupX = "There is a new message in the group %s"; +$UserIsAlreadySubscribedToThisGroup = "User is already subscribed to this group"; ?> \ No newline at end of file diff --git a/main/lang/english/wiki.inc.php b/main/lang/english/wiki.inc.php old mode 100755 new mode 100644 index dc975178d8..a05a739abf --- a/main/lang/english/wiki.inc.php +++ b/main/lang/english/wiki.inc.php @@ -176,4 +176,5 @@ $Feedback3 = "Third message"; $FProgress = "Progress"; $PutATimeLimit = "Set a time limit"; $StandardTask = "Standard Task"; +$ThePageHasBeenExportedToDocArea = "The page has been exported to doc area"; ?> \ No newline at end of file diff --git a/main/lang/spanish/survey.inc.php b/main/lang/spanish/survey.inc.php old mode 100755 new mode 100644 index 1b904f1060..f5e538cbb4 --- a/main/lang/spanish/survey.inc.php +++ b/main/lang/spanish/survey.inc.php @@ -202,4 +202,5 @@ $BackToSurvey = "Volver a la encuesta"; $UpdateInformation = "Actualización de información"; $PleaseFillSurvey = "Por favor, llene la encuesta"; $ReportingOverview = "Sumario de informes"; +$ThereAreNotQuestionsForthisSurvey = "No hay preguntas para esta encuesta"; ?> \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index a8b95513ed..4f69ea86d6 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -764,7 +764,7 @@ $UserAdded = "Usuario agregado"; $UpdatedIn = "Actualizado"; $Metadata = "Metadatos"; $langAddMetadata = "Ver/Editar Metadatos"; -$SendMessage = "Enviar Mensaje"; +$SendMessage = "Enviar mensaje"; $SeeForum = "Ver foro"; $SeeMore = "Ver más"; $NoDataAvailable = "No hay datos disponibles"; diff --git a/main/lang/spanish/userInfo.inc.php b/main/lang/spanish/userInfo.inc.php index a64de1943a..f74c2a069d 100644 --- a/main/lang/spanish/userInfo.inc.php +++ b/main/lang/spanish/userInfo.inc.php @@ -160,7 +160,7 @@ $DeleteFromGroup = "Eliminar de grupo"; $GroupMembers = "Miembros del grupo"; $Subscribe = "Inscribir"; $YouAreInvitedToGroupContent = "Ud. esta invitado al contenido del grupo"; -$YouAreInvitedToGroup = "Tu estas invitado a unirte al grupo"; +$YouAreInvitedToGroup = "Estas invitado a unirte al grupo"; $ToSubscribeClickInTheLinkBelow = "Para inscribirte has clic en el siguiente enlace"; $ReturnToInbox = "Regresar a bandeja de entrada"; $View = "Vista"; @@ -188,4 +188,5 @@ $YouHaveReceivedANewMessageInTheGroupX = "Usted ha recibido un nuevo mensaje en $ClickHereToSeeMessageGroup = "Clic aquí para ver el mensaje de grupo"; $OrCopyPasteTheFollowingUrl = "O copiar y pegar la siguente url"; $ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s"; +$UserIsAlreadySubscribedToThisGroup = "El usuario ya esta suscrito a este grupo"; ?> \ No newline at end of file diff --git a/main/lang/spanish/wiki.inc.php b/main/lang/spanish/wiki.inc.php old mode 100755 new mode 100644 index 3ab7c132e2..e71a69012f --- a/main/lang/spanish/wiki.inc.php +++ b/main/lang/spanish/wiki.inc.php @@ -176,4 +176,5 @@ $Feedback3 = "Tercer mensaje"; $FProgress = "Progreso"; $PutATimeLimit = "Establecer una limitación temporal"; $StandardTask = "Tarea estándard"; +$ThePageHasBeenExportedToDocArea = "La página ha sido exportada al área de documentos"; ?> \ No newline at end of file From 95707e7d5e5ad62547e6ef0db5e371407e9d33ae Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Wed, 6 Jan 2010 15:43:37 -0500 Subject: [PATCH 2/7] minor - fixed list of question doesn't work - partial CT#462 --- main/exercice/admin.php | 11 +++++++++++ main/exercice/exercise.class.php | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main/exercice/admin.php b/main/exercice/admin.php index 07c995614a..eaef8b129b 100755 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -448,6 +448,17 @@ function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision) } // --> "; + +$htmlHeadXtra[] = ''; //jQuery +$htmlHeadXtra[] = ''; + Display::display_header($nameTools,'Exercise'); echo '
'; diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index c69b7f9257..4004a860ea 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -7,7 +7,6 @@ * @author Olivier Brouckaert * @version $Id: exercise.class.php 22046 2009-07-14 01:45:19Z ivantcholakov $ */ -require_once '../inc/global.inc.php'; define('ALL_ON_ONE_PAGE',1); define('ONE_PER_PAGE',2); @@ -15,16 +14,6 @@ define('EXERCISE_FEEDBACK_TYPE_END',0); define('EXERCISE_FEEDBACK_TYPE_DIRECT',1); define('EXERCISE_FEEDBACK_TYPE_EXAM',2); -$htmlHeadXtra[] = ''; //jQuery -$htmlHeadXtra[] = ''; - if(!class_exists('Exercise')): class Exercise From 497a2d498a89174cbd3cf8128e70bd41a65c3434 Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Wed, 6 Jan 2010 15:50:07 -0500 Subject: [PATCH 3/7] added focus for input text when you create a exercise - partial CT#462 --- main/exercice/admin.php | 10 ---------- main/exercice/exercise_admin.php | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main/exercice/admin.php b/main/exercice/admin.php index eaef8b129b..7c8ce3effa 100755 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -449,16 +449,6 @@ function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision) // --> "; -$htmlHeadXtra[] = ''; //jQuery -$htmlHeadXtra[] = ''; - Display::display_header($nameTools,'Exercise'); echo '
'; diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php index 231b852697..75613c552c 100755 --- a/main/exercice/exercise_admin.php +++ b/main/exercice/exercise_admin.php @@ -124,6 +124,16 @@ $htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; //jQuery +$htmlHeadXtra[] = ''; + /********************* * INIT EXERCISE *********************/ From 3c1ff37cb08083810b4fc5728b3d00789762ff15 Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Wed, 6 Jan 2010 16:02:21 -0500 Subject: [PATCH 4/7] fixed questionable code about condition with strpos function - see CT#401 --- main/wiki/diff.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/wiki/diff.inc.php b/main/wiki/diff.inc.php index 74d281ea0b..cf75c374ae 100755 --- a/main/wiki/diff.inc.php +++ b/main/wiki/diff.inc.php @@ -116,15 +116,15 @@ { $content = array(); - if ( strpos( $str, "\r\n" ) != false ) + if ( strpos( $str, "\r\n" ) !== false ) { $content = explode("\r\n", $str ); } - elseif ( strpos( $str, "\n" ) != false ) + elseif ( strpos( $str, "\n" ) !== false ) { $content = explode( "\n", $str ); } - elseif ( strpos( $str, "\r" ) != false ) + elseif ( strpos( $str, "\r" ) !== false ) { $content = explode( "\r", $str ); } From 12a88ce8e8f6839470fd8439e85697ff2320022c Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Wed, 6 Jan 2010 16:04:41 -0500 Subject: [PATCH 5/7] minor - fixed some questionable code - partial CT#401 --- main/wiki/diff.inc.php | 6 +++--- main/wiki/wiki.inc.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/wiki/diff.inc.php b/main/wiki/diff.inc.php index cf75c374ae..c092b70ca4 100755 --- a/main/wiki/diff.inc.php +++ b/main/wiki/diff.inc.php @@ -116,15 +116,15 @@ { $content = array(); - if ( strpos( $str, "\r\n" ) !== false ) + if ( api_strpos( $str, "\r\n" ) !== false ) { $content = explode("\r\n", $str ); } - elseif ( strpos( $str, "\n" ) !== false ) + elseif ( api_strpos( $str, "\n" ) !== false ) { $content = explode( "\n", $str ); } - elseif ( strpos( $str, "\r" ) !== false ) + elseif ( api_strpos( $str, "\r" ) !== false ) { $content = explode( "\r", $str ); } diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php index d8bf4a5808..565673a603 100755 --- a/main/wiki/wiki.inc.php +++ b/main/wiki/wiki.inc.php @@ -97,7 +97,7 @@ function links_to($input) if ($input_array[$key-1]=='[[' AND $input_array[$key+1]==']]') { - if (strpos($value, "|") != false) + if (api_strpos($value, "|") !== false) { $full_link_array=explode("|", $value); $link=trim($full_link_array[0]); @@ -241,7 +241,7 @@ function make_wiki_link_clickable($input) ///////// //now full wikilink - if (strpos($value, "|") != false) + if (api_strpos($value, "|") !== false) { $full_link_array=explode("|", $value); $link=trim($full_link_array[0]); From 57975a688c7ec953312847a2ec8373cda5a33452 Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Wed, 6 Jan 2010 16:05:40 -0500 Subject: [PATCH 6/7] Changed the name of the id and show the two icon in question pool CT#462 --- main/announcements/announcements.php | 4 ++-- main/exercice/question_pool.php | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index 0791f5602f..eb8dc727f5 100755 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -211,7 +211,7 @@ $htmlHeadXtra[] = to_javascript(); $htmlHeadXtra[] = ''; //jQuery $htmlHeadXtra[] = '