From 3b16635c327dc94aab51586bb34e2898f98ea50f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 24 Jul 2012 18:49:14 +0200 Subject: [PATCH 1/6] Should fix bug when including file see #5244 --- plugin/bbb/config.php | 5 ++++- plugin/bbb/install.php | 2 +- plugin/bbb/lib/bbb.lib.php | 3 --- plugin/bbb/listing.php | 2 +- plugin/bbb/plugin.php | 2 +- plugin/bbb/start.php | 2 +- plugin/bbb/uninstall.php | 2 +- plugin/olpc_peru_filter/install.php | 2 +- plugin/olpc_peru_filter/plugin.php | 2 +- plugin/olpc_peru_filter/uninstall.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugin/bbb/config.php b/plugin/bbb/config.php index a8e79220ec..fda6f94043 100644 --- a/plugin/bbb/config.php +++ b/plugin/bbb/config.php @@ -4,5 +4,8 @@ /* bbb parameters that will be registered in the course settings */ require_once '../../main/inc/global.inc.php'; +require_once api_get_path(LIBRARY_PATH).'plugin.class.php'; + require_once 'lib/bbb.lib.php'; -require_once 'lib/bbb_api.php'; \ No newline at end of file +require_once 'lib/bbb_api.php'; +require_once 'lib/bbb_plugin.class.php'; \ No newline at end of file diff --git a/plugin/bbb/install.php b/plugin/bbb/install.php index 3b5bba2956..5b38d0d2ae 100644 --- a/plugin/bbb/install.php +++ b/plugin/bbb/install.php @@ -8,5 +8,5 @@ * Initialization */ -require_once 'config.php'; +require_once dirname(__FILE__).'/config.php'; BBBPlugin::create()->install(); \ No newline at end of file diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index 2b90ac3b66..22bb147a67 100644 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -4,9 +4,6 @@ * @package chamilo.plugin.bigbluebutton */ -require_once api_get_path(LIBRARY_PATH).'plugin.class.php'; -require_once 'bbb_plugin.class.php'; - class bbb { var $url; diff --git a/plugin/bbb/listing.php b/plugin/bbb/listing.php index 23079d55c7..30f17744ef 100644 --- a/plugin/bbb/listing.php +++ b/plugin/bbb/listing.php @@ -8,7 +8,7 @@ */ $course_plugin = 'bbb'; //needed in order to load the plugin lang variables -require_once 'config.php'; +require_once dirname(__FILE__).'/config.php'; $tool_name = get_lang('Videoconference'); $tpl = new Template($tool_name); diff --git a/plugin/bbb/plugin.php b/plugin/bbb/plugin.php index 0b24ed9070..4c38a011e1 100644 --- a/plugin/bbb/plugin.php +++ b/plugin/bbb/plugin.php @@ -1,4 +1,4 @@ get_info(); \ No newline at end of file diff --git a/plugin/bbb/start.php b/plugin/bbb/start.php index aa5d59dbfb..69de4bdb6a 100644 --- a/plugin/bbb/start.php +++ b/plugin/bbb/start.php @@ -8,7 +8,7 @@ */ $course_plugin = 'bbb'; //needed in order to load the plugin lang variables -require_once 'config.php'; +require_once dirname(__FILE__).'/config.php'; $tool_name = get_lang('Videoconference'); $tpl = new Template($tool_name); $bbb = new bbb(); diff --git a/plugin/bbb/uninstall.php b/plugin/bbb/uninstall.php index 4167a208a2..e8f6b3d23a 100644 --- a/plugin/bbb/uninstall.php +++ b/plugin/bbb/uninstall.php @@ -9,5 +9,5 @@ /** * Queries */ -require_once 'config.php'; +require_once dirname(__FILE__).'/config.php'; BBBPlugin::create()->uninstall(); \ No newline at end of file diff --git a/plugin/olpc_peru_filter/install.php b/plugin/olpc_peru_filter/install.php index da546374e3..d95a8ed8b8 100644 --- a/plugin/olpc_peru_filter/install.php +++ b/plugin/olpc_peru_filter/install.php @@ -9,5 +9,5 @@ * Initialization */ -require_once 'config.php'; +require_once dirname(__FILE__).'/config.php'; OLPC_Peru_FilterPlugin::create()->install(); \ No newline at end of file diff --git a/plugin/olpc_peru_filter/plugin.php b/plugin/olpc_peru_filter/plugin.php index 4da5e508fd..775d8bf38b 100644 --- a/plugin/olpc_peru_filter/plugin.php +++ b/plugin/olpc_peru_filter/plugin.php @@ -1,4 +1,4 @@ get_info(); diff --git a/plugin/olpc_peru_filter/uninstall.php b/plugin/olpc_peru_filter/uninstall.php index 213dfcb190..e1813f8e50 100644 --- a/plugin/olpc_peru_filter/uninstall.php +++ b/plugin/olpc_peru_filter/uninstall.php @@ -9,5 +9,5 @@ /** * Queries */ -require_once 'config.php'; +require_once dirname(__FILE__).'/config.php'; OLPC_Peru_FilterPlugin::create()->uninstall(); From 136227c8e9241521b154ed60c7bfea8963aca719 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 24 Jul 2012 18:50:03 +0200 Subject: [PATCH 2/6] Minor - Fixing PHP warnings --- main/inc/lib/display.lib.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 1f25c123a2..ae5524335f 100644 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1292,7 +1292,7 @@ class Display { * @param bool add a div wrapper * @todo use templates **/ - public function return_rating_system($id, $url, $point_info = array(), $add_div_wrapper = true) { + public static function return_rating_system($id, $url, $point_info = array(), $add_div_wrapper = true) { $number_of_users_who_voted = isset($point_info['users_who_voted']) ? $point_info['users_who_voted'] : null; $percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0; @@ -1336,11 +1336,11 @@ class Display { return $html; } - function return_default_table_class() { + public static function return_default_table_class() { return 'data_table'; } - public function page_header($title, $second_title = null) { + public static function page_header($title, $second_title = null) { $title = Security::remove_XSS($title); if (!empty($second_title)) { $second_title = Security::remove_XSS($second_title); @@ -1349,17 +1349,17 @@ class Display { return '

'.$title.'

'; } - public function page_header_and_translate($title, $second_title = null) { + public static function page_header_and_translate($title, $second_title = null) { $title = get_lang($title); return self::page_header($title, $second_title); } - public function page_subheader_and_translate($title, $second_title = null) { + public static function page_subheader_and_translate($title, $second_title = null) { $title = get_lang($title); return self::page_subheader($title, $second_title); } - public function page_subheader($title, $second_title = null) { + public static function page_subheader($title, $second_title = null) { if (!empty($second_title)) { $second_title = Security::remove_XSS($second_title); $title .= " $second_title"; @@ -1380,7 +1380,7 @@ class Display { return $html; } - function bar_progress($percentage, $show_percentage = true, $extra_info = null) { + public static function bar_progress($percentage, $show_percentage = true, $extra_info = null) { $percentage = intval($percentage); $div = '
@@ -1395,7 +1395,7 @@ class Display { return $div; } - function badge($count, $type ="warning") { + public static function badge($count, $type ="warning") { $class = ''; switch ($type) { @@ -1422,7 +1422,7 @@ class Display { return null; } - function badge_group($badge_list) { + public static function badge_group($badge_list) { $html = '
'; foreach ($badge_list as $badge) { $html .= $badge; @@ -1431,7 +1431,7 @@ class Display { return $html; } - function label($content, $type = null) { + public static function label($content, $type = null) { $class = ''; switch ($type) { case 'success': @@ -1460,7 +1460,7 @@ class Display { return $html; } - function actions($items) { + public static function actions($items) { if (!empty($items)) { $html = '
    '; foreach ($items as $value) { @@ -1480,7 +1480,7 @@ class Display { /** * Prints a tooltip */ - function tip($text, $tip) { + public static function tip($text, $tip) { if (empty($tip)) { return $text; } From 72ea95371de9e16e1c6f6ec3841b72dfcbf34dcf Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 24 Jul 2012 19:00:47 +0200 Subject: [PATCH 3/6] Removes variable "NameOfLang" in order to avoid PHP warning "Warning: Illegal string offset" (variable seems to be unused) --- main/lang/arabic/trad4all.inc.php | 1 - main/lang/asturian/trad4all.inc.php | 1 - main/lang/brazilian/trad4all.inc.php | 1 - main/lang/bulgarian/trad4all.inc.php | 1 - main/lang/catalan/trad4all.inc.php | 1 - main/lang/croatian/trad4all.inc.php | 1 - main/lang/czech/trad4all.inc.php | 1 - main/lang/danish/trad4all.inc.php | 1 - main/lang/dutch/trad4all.inc.php | 1 - main/lang/english/trad4all.inc.php | 51 ++++++- main/lang/esperanto/trad4all.inc.php | 1 - main/lang/finnish/trad4all.inc.php | 1 - main/lang/french/trad4all.inc.php | 7 +- main/lang/galician/trad4all.inc.php | 1 - main/lang/german/trad4all.inc.php | 90 ++++++------- main/lang/greek/trad4all.inc.php | 1 - main/lang/hungarian/trad4all.inc.php | 1 - main/lang/indonesian/trad4all.inc.php | 1 - main/lang/italian/trad4all.inc.php | 1 - main/lang/korean/trad4all.inc.php | 1 - main/lang/latvian/trad4all.inc.php | 163 ++++++++++++++++++++++- main/lang/lithuanian/trad4all.inc.php | 1 - main/lang/macedonian/trad4all.inc.php | 1 - main/lang/norwegian/trad4all.inc.php | 1 - main/lang/occitan/trad4all.inc.php | 1 - main/lang/persian/trad4all.inc.php | 1 - main/lang/polish/trad4all.inc.php | 1 - main/lang/portuguese/trad4all.inc.php | 1 - main/lang/quechua_cusco/trad4all.inc.php | 1 - main/lang/romanian/trad4all.inc.php | 1 - main/lang/russian/trad4all.inc.php | 1 - main/lang/serbian/trad4all.inc.php | 1 - main/lang/simpl_chinese/trad4all.inc.php | 1 - main/lang/slovak/trad4all.inc.php | 1 - main/lang/slovenian/trad4all.inc.php | 12 +- main/lang/spanish/trad4all.inc.php | 3 +- main/lang/spanish_latin/trad4all.inc.php | 1 - main/lang/swedish/trad4all.inc.php | 1 - main/lang/thai/trad4all.inc.php | 1 - main/lang/trad_chinese/trad4all.inc.php | 1 - main/lang/turkish/trad4all.inc.php | 1 - main/lang/ukrainian/trad4all.inc.php | 1 - 42 files changed, 269 insertions(+), 93 deletions(-) diff --git a/main/lang/arabic/trad4all.inc.php b/main/lang/arabic/trad4all.inc.php index fb1f0b5035..a4081cfb03 100644 --- a/main/lang/arabic/trad4all.inc.php +++ b/main/lang/arabic/trad4all.inc.php @@ -195,7 +195,6 @@ $langNameOfLang['turkce'] = "التركية"; $langNameOfLang['vietnamese'] = "الفتنامية"; $UserInfo = "معلومات المستخدم"; $langModifyQuestion = "تعديل السؤال"; -$langNameOfLang = "اسم اللغة"; $langCheckAll = "اختر الجميع"; $langNbAnnoucement = "إعلان"; $lang_no_access_here = " لا يسمح بالوصول إلى هنا"; diff --git a/main/lang/asturian/trad4all.inc.php b/main/lang/asturian/trad4all.inc.php index 415af9fe1d..11bc010533 100644 --- a/main/lang/asturian/trad4all.inc.php +++ b/main/lang/asturian/trad4all.inc.php @@ -201,7 +201,6 @@ $langNameOfLang['turkce'] = "turcu"; $langNameOfLang['vietnamese'] = "vietnamita"; $UserInfo = "información del usuariu"; $langModifyQuestion = "Modificar la entruga"; -$langNameOfLang = "yome de la llingua"; $langCheckAll = "comprobar"; $langNbAnnoucement = "Anuncies"; $lang_no_access_here = "Nun tien permisu pa entrar equí"; diff --git a/main/lang/brazilian/trad4all.inc.php b/main/lang/brazilian/trad4all.inc.php index 809ed41bec..fb8505ed68 100644 --- a/main/lang/brazilian/trad4all.inc.php +++ b/main/lang/brazilian/trad4all.inc.php @@ -203,7 +203,6 @@ $langNameOfLang['turkce'] = "Turco"; $langNameOfLang['vietnamese'] = "vietnamita"; $UserInfo = "informações do usuário"; $langModifyQuestion = "Modificar a questão"; -$langNameOfLang = "Uome do Idioma"; $langCheckAll = "Verificar tudo"; $langNbAnnoucement = "Anúncio"; $lang_no_access_here = "Você não tem permissão para acessar esta área"; diff --git a/main/lang/bulgarian/trad4all.inc.php b/main/lang/bulgarian/trad4all.inc.php index 0ee7eb90fb..eb9ad7fe41 100644 --- a/main/lang/bulgarian/trad4all.inc.php +++ b/main/lang/bulgarian/trad4all.inc.php @@ -202,7 +202,6 @@ $langNameOfLang['turkce'] = "турски"; $langNameOfLang['vietnamese'] = "виетнамски"; $UserInfo = "потребителска информация"; $langModifyQuestion = "Промяна на въпроса"; -$langNameOfLang = "Наименование на езика"; $langCheckAll = "Провери всички"; $langNbAnnoucement = "Обяви"; $lang_no_access_here = "Нямате достъп тук."; diff --git a/main/lang/catalan/trad4all.inc.php b/main/lang/catalan/trad4all.inc.php index 84ce10af8d..e16106317a 100644 --- a/main/lang/catalan/trad4all.inc.php +++ b/main/lang/catalan/trad4all.inc.php @@ -202,7 +202,6 @@ $langNameOfLang['turkce'] = "Turc"; $langNameOfLang['vietnamese'] = "Vietnamita"; $UserInfo = "Informació de l'usuari"; $langModifyQuestion = "Modificar la pregunta"; -$langNameOfLang = "aom de l'idioma"; $langCheckAll = "Verificar tot"; $langNbAnnoucement = "Anunci"; $lang_no_access_here = "No té accés aquí"; diff --git a/main/lang/croatian/trad4all.inc.php b/main/lang/croatian/trad4all.inc.php index d80abb8903..563db59a4c 100644 --- a/main/lang/croatian/trad4all.inc.php +++ b/main/lang/croatian/trad4all.inc.php @@ -195,7 +195,6 @@ $langNameOfLang['turkce'] = "turski"; $langNameOfLang['vietnamese'] = "vijetnamski"; $UserInfo = "podatci o korisniku"; $langModifyQuestion = "Izmijeni pitanje"; -$langNameOfLang = "Ime jezika"; $langCheckAll = "Označi sve"; $langNbAnnoucement = "Obavijest"; $lang_no_access_here = "Zabranjen pristup"; diff --git a/main/lang/czech/trad4all.inc.php b/main/lang/czech/trad4all.inc.php index 0bcd996a7d..369d75a7b7 100644 --- a/main/lang/czech/trad4all.inc.php +++ b/main/lang/czech/trad4all.inc.php @@ -121,7 +121,6 @@ $langOnLine = "Online"; $langUsers = "Uživatelé"; $langPlatformAdmin = "Administrace platformy"; $UserInfo = "informace o uživateli"; -$langNameOfLang = "Název jazyka"; $langCheckAll = "Označ vše"; $langNbAnnoucement = "Oznámení"; $lang_no_access_here = "Žádný přístup"; diff --git a/main/lang/danish/trad4all.inc.php b/main/lang/danish/trad4all.inc.php index 48ebb04a78..d20cbb671e 100644 --- a/main/lang/danish/trad4all.inc.php +++ b/main/lang/danish/trad4all.inc.php @@ -194,7 +194,6 @@ $langNameOfLang['turkce'] = "tyrkisk"; $langNameOfLang['vietnamese'] = "vietnamesisk"; $UserInfo = "brugerinformation"; $langModifyQuestion = "Rediger spørgsmålet"; -$langNameOfLang = "Sprogets navn"; $langCheckAll = "Afkryds alle"; $langNbAnnoucement = "Meddelelser"; $lang_no_access_here = "Ingen adgang"; diff --git a/main/lang/dutch/trad4all.inc.php b/main/lang/dutch/trad4all.inc.php index 30e2905ba3..608746100f 100644 --- a/main/lang/dutch/trad4all.inc.php +++ b/main/lang/dutch/trad4all.inc.php @@ -201,7 +201,6 @@ $langNameOfLang['turkce'] = "Turks"; $langNameOfLang['vietnamese'] = "Vietnamees"; $UserInfo = "gebruikersinformatie"; $langModifyQuestion = "Wijzig vraag"; -$langNameOfLang = "Caam van de taal"; $langCheckAll = "Controleer alles"; $langNbAnnoucement = "Mededeling"; $lang_no_access_here = "Geen toegang tot deze gegevens"; diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index 22e75bbd06..480c70bfb5 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -205,7 +205,6 @@ $langNameOfLang['turkce'] = "turkish"; $langNameOfLang['vietnamese'] = "vietnamese"; $UserInfo = "user information"; $langModifyQuestion = "Save the question"; -$langNameOfLang = "yame of language"; $langCheckAll = "Check all"; $langNbAnnoucement = "Announcement"; $lang_no_access_here = "No access here"; @@ -1256,4 +1255,54 @@ $ImportThematic = "Import course progress"; $ExportThematic = "Export course progress"; $DeleteAllThematic = "Delete all course progress"; $ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation = "This platform was unable to send the email. Please contact %s for more information."; +$FirstLoginChangePassword = "This is your first login. Please update your password to something you will remember."; +$NeedContactAdmin = "Click here to contact the administrator"; +$MarkAll = "Select all"; +$UnmarkAll = "Unselect all"; +$NotAuthorized = "Not authorized"; +$UnknownAction = "Unknown action"; +$First = "First"; +$Last = "Last"; +$YouAreNotAuthorized = "You are not authorized to do this"; +$NoImplementation = "No implementation available yet for this action"; +$ReplaceExistingEntries = "Replace existing entries"; +$AddItems = "Add items"; +$NotFound = "Not found"; +$SentSuccessfully = "Successfully sent"; +$SentFailed = "Sending failed"; +$PortalSessionsLimitReached = "The number of sessions limit for this portal has been reached"; +$ANewSessionWasCreated = "A new session has been created"; +$Online = "Online"; +$Offline = "Offline"; +$TimelineItemText = "Text"; +$TimelineItemMedia = "Media"; +$TimelineItemMediaCaption = "Caption"; +$TimelineItemMediaCredit = "Credits"; +$TimelineItemTitleSlide = "Slider title"; +$SSOError = "Single Sign On error"; +$Sent = "Sent"; +$TimelineItem = "Item"; +$Listing = "Listing"; +$CourseRssTitle = "Course RSS"; +$CourseRssDescription = "RSS feed for all course notifications"; +$AllowPublicCertificates = "Learner certificates are public"; +$PortalHomepageEdited = "Portal homepage updated"; +$UserRegistrationTitle = "User registration"; +$UserRegistrationComment = "Actions to be fired when a user registers to the platform"; +$Disabled = "Disabled"; +$Required = "Required"; +$CategorySaved = "Category saved"; +$CategoryRemoved = "Category removed"; +$BrowserDoesNotSupportNanogongPlayer = "Your browser doesn't support the Nanogong player"; +$ImportCSV = "Import CSV"; +$DataTableLengthMenu = "Table length"; +$DataTableZeroRecords = "No record found"; +$MalformedUrl = "Badly formed URL"; +$DataTableInfo = "Info"; +$DataTableInfoEmpty = "Empty"; +$DataTableInfoFiltered = "Filtered"; +$DataTableSearch = "Search"; +$HideColumn = "Hide column"; +$DisplayColumn = "Show column"; +$LegalAgreementAccepted = "Legal agreement accepted"; ?> \ No newline at end of file diff --git a/main/lang/esperanto/trad4all.inc.php b/main/lang/esperanto/trad4all.inc.php index 245385ce02..f296798884 100644 --- a/main/lang/esperanto/trad4all.inc.php +++ b/main/lang/esperanto/trad4all.inc.php @@ -157,7 +157,6 @@ $langNameOfLang['turkce'] = "turka"; $langNameOfLang['vietnamese'] = "vjetnama"; $UserInfo = "uzulaj informoj"; $langModifyQuestion = "Ŝanĝi la demandon"; -$langNameOfLang = "nomo de la lingvo"; $langCheckAll = "Kontroli ĉion"; $langNbAnnoucement = "Komuniko"; $lang_no_access_here = "Ne aliro ĉi-tien"; diff --git a/main/lang/finnish/trad4all.inc.php b/main/lang/finnish/trad4all.inc.php index 35160d69c8..2515561793 100644 --- a/main/lang/finnish/trad4all.inc.php +++ b/main/lang/finnish/trad4all.inc.php @@ -175,7 +175,6 @@ $langUsers = "Käyttäjät"; $langPlatformAdmin = "Alustan ylläpito"; $UserInfo = "tietoja käyttäjästä"; $langModifyQuestion = "Muokkaa kysymystä"; -$langNameOfLang = "Kielen nimi"; $langCheckAll = "Valitse kaikki"; $langNbAnnoucement = "Ilmoitus"; $lang_no_access_here = "Sinulla ei ole pääsyä tänne"; diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index b6a2e1999f..a280d0fd9a 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -205,7 +205,6 @@ $langNameOfLang['turkce'] = "turque"; $langNameOfLang['vietnamese'] = "vietnamien"; $UserInfo = "Fiche utilisateur"; $langModifyQuestion = "Modifier la question"; -$langNameOfLang = "Langue"; $langCheckAll = "Sélectionner tout"; $langNbAnnoucement = "Annonces"; $lang_no_access_here = "Pas d'accès"; @@ -1199,7 +1198,7 @@ $XStarsOutOf5 = "%s étoiles sur 5"; $Visit = "Visite"; $Visits = "Visites"; $YourVote = "Votre vote"; -$HottestCourses = "Cours les plus actifs"; +$HottestCourses = "Cours les plus populaires"; $SentAtX = "Envoyé à %s"; $dateTimeFormatShort = "%b %d, %Y at %I:%M %p"; $dateTimeFormatShortTimeFirst = "%I:%M %p, %b %d %Y"; @@ -1237,6 +1236,7 @@ $ReturnToCourseHomepage = "Retour à la page d'accueil"; $WebCamClip = "Webcam Clip"; $Snapshot = "Capturer"; $TakeYourPhotos = "Prenez vos photos"; +$LocalInputImage = "Image locale"; $ClipSent = "Image envoyé"; $Auto = "Automatique"; $Stop = "Stop"; @@ -1245,4 +1245,7 @@ $ActivateEvent = "Activer événement"; $AvailableEventKeys = "Clés d'événements disponibles. Utilisez-les entre (())."; $Events = "Événements"; $EventTypeName = "Nom du type d'événement"; +$ExportToPDFOnlyHTMLAndImages = "Exporter uniquement les pages web et les images à PDF"; +$CourseCatalog = "Catalogue de cours"; +$Go = "En avant!"; ?> \ No newline at end of file diff --git a/main/lang/galician/trad4all.inc.php b/main/lang/galician/trad4all.inc.php index cdbd88f987..cddf56d3f0 100644 --- a/main/lang/galician/trad4all.inc.php +++ b/main/lang/galician/trad4all.inc.php @@ -203,7 +203,6 @@ $langNameOfLang['turkce'] = "turco"; $langNameOfLang['vietnamese'] = "vietnamita"; $UserInfo = "Información do usuario"; $langModifyQuestion = "Modificar a pregunta"; -$langNameOfLang = "Nome do idioma"; $langCheckAll = "comprobar"; $langNbAnnoucement = "Avisos"; $lang_no_access_here = "Non ten autorización para acceder aquí"; diff --git a/main/lang/german/trad4all.inc.php b/main/lang/german/trad4all.inc.php index 1238cce46a..15003d59b5 100644 --- a/main/lang/german/trad4all.inc.php +++ b/main/lang/german/trad4all.inc.php @@ -1,4 +1,7 @@ -
    -Sie sind dabei eine der besten Open Source E-Learning Plattformen auf dem Markt zu starten. Wie viele andere Open Source Projekte, basiert dieses Projekt auf einer großen Community von Studenten, Dozenten, Lehrern, Entwicklern und Autoren die alle bemüht sind, das Projekt bekannt zu machen.

    -Wenn wir etwas mehr von Ihnen wissen, denn Sie sind einer unsere wichtigsten User, der Sie dieses E-Learning-System verwalten, können wir andere wissen lassen, dass Sie unsere Software benutzen und Sie darüber informieren, wenn wir Events organisieren, die vielleicht für Sie wichtig sein könnten.

    - -Mit dem Ausfüllen dieses Formulars akzeptieren Sie, das die Chamilo Association oder ihre Mitgleider Ihnen Informationen per Email zu senden darf, soweit es sich um Events der Chamilo Community oder Updates der Chamilo-Software handelt. Dies hilft der Community als Organsation zu wachsen, die ständig bemüht ist Ihre zeit und Ihre Privatsphäre zu achten und zu respektieren.
    -
    -Bitte beachten Sie, das nicht verpflichtet sind, dieses Formular auszufüllen.Wenn Sie anonym bleiben wollen, haben Sie keine Möglichkeit die Vorteile eines registrierten Portal-Administrators zu nutzen, aber wir respektieren Ihre Entscheidung. Lassen Sie dann einfach dieses Formular leer und klicken Sie auf\"Weiter\".

    "; +$ContactInformationDescription = "Hallo,
    \n
    \nSie sind dabei eine der besten Open Source E-Learning Plattformen auf dem Markt zu starten. Wie viele andere Open Source Projekte, basiert dieses Projekt auf einer großen Community von Studenten, Dozenten, Lehrern, Entwicklern und Autoren die alle bemüht sind, das Projekt bekannt zu machen.

    \nWenn wir etwas mehr von Ihnen wissen, denn Sie sind einer unsere wichtigsten User, der Sie dieses E-Learning-System verwalten, können wir andere wissen lassen, dass Sie unsere Software benutzen und Sie darüber informieren, wenn wir Events organisieren, die vielleicht für Sie wichtig sein könnten.

    \n\nMit dem Ausfüllen dieses Formulars akzeptieren Sie, das die Chamilo Association oder ihre Mitgleider Ihnen Informationen per Email zu senden darf, soweit es sich um Events der Chamilo Community oder Updates der Chamilo-Software handelt. Dies hilft der Community als Organsation zu wachsen, die ständig bemüht ist Ihre zeit und Ihre Privatsphäre zu achten und zu respektieren.
    \n
    \nBitte beachten Sie, das nicht verpflichtet sind, dieses Formular auszufüllen.Wenn Sie anonym bleiben wollen, haben Sie keine Möglichkeit die Vorteile eines registrierten Portal-Administrators zu nutzen, aber wir respektieren Ihre Entscheidung. Lassen Sie dann einfach dieses Formular leer und klicken Sie auf\"Weiter\".

    "; $CompanyActivity = "Tätigkeitsbereich Hrer Firma / Organisation"; $DateUnLock = "Termin freigeben"; $DateLock = "Termin sperren"; @@ -967,7 +959,7 @@ $TermsAndConditions = "Nutzungsbedingungen"; $ReadTermsAndConditions = "Nutzungsbedingungen lesen"; $IAcceptTermsAndConditions = "Ich habe die Nutzungsbedingungen gelsen und akzeptiere sie"; $YouHaveToAcceptTermsAndConditions = "Sie müssen die Nutzungsbedingungen akzeptieren, um fortfahren zu können."; -$BrowserDontSupportsSVG = "Ihr Browser unterstützt keine SVG-Dateien. Um das Zeichnen-Werkzeug verwenden zu können, benötigen Sie einen modernen Browser wie Firefox oder Chrome verwenden. "; +$BrowserDontSupportsSVG = "Ihr Browser unterstützt keine SVG-Dateien. Um das Zeichnen-Werkzeug verwenden zu können, benötigen Sie einen modernen Browser wie Firefox oder Chrome verwenden."; $FillWithExemplaryContent = "Mit Demo-Inhalt füllen"; $ToolVideoconference = "Video-Konferenz"; $SelectSVGEditImage = "Bild auswählen"; @@ -1014,7 +1006,7 @@ $MyStatistics = "Meine Auswertungen"; $FromDateXToDateY = "Von %s bis %s"; $CourseThematicAdvance = "Thematischer Aufbau"; $Clean = "Sauber"; -$MailNotifyInvitation = "Mail-Benachrichtigung, bei neuen Einladungen "; +$MailNotifyInvitation = "Mail-Benachrichtigung, bei neuen Einladungen"; $MailNotifyMessage = "Mail-Benachrichtigung, bei neuen persönlichen Nachrichten"; $MailNotifyGroupMessage = "Mail-Benachrichtigung, bei neuen Gruppen-Nachrichten"; $ClickToSelectOrDragAndDropMultipleFilesOnTheUploadField = "Klicken Sie auf den Bereich unten, um Dateien von Ihrem Computer auszuwählen (Sie können CTRL + Click verwenden, um mehrere Dateien auszuwählen) oder ziehen Sie die Dateien direkt per Drag&Drop in den Bereich unten. Das System kümmert sich um den Rest!"; @@ -1040,7 +1032,7 @@ $VoiceRecord = "Stimmaufnahme"; $BrowserNotSupportNanogongSend = "Ihr Browser hat die Stimmaufnahme nicht an die Plattform übermittelt. Sie können die Aufnahme auch lokal auf Ihrem Computer speichern und später anfügen. Um alle Funktion nutzen zu können, empfehlen wir Ihnen die Verwendung eines modernen Browsers wir Firefox oder Chrome."; $FileExistRename = "Es existiert bereits eine Datei mit gleichem Namen. Benennen Sie die Datei bitte um."; $GradebookAndAttendances = "Bewertungen und Anwesenheiten"; -$SelectADateRange = "Einen Datumsbereich wählen "; +$SelectADateRange = "Einen Datumsbereich wählen"; $AllDone = "Alles erledigt"; $AllNotDone = "Alles unerledigt"; $GroupUpdated = "aktualisiert"; @@ -1059,7 +1051,6 @@ $CourseCodeAlreadyExistExplained = "Wenn ein Kurs-Kürzel dupliziert wird, stell $CantDeleteReadonlyFiles = "Kann keine Datein löschen die den Nur-Lesen-Modus haben."; $Uploaded = "Hochgeladen."; $Saved = "Gespeichert."; -$GotoCourse = "gehe zu Kurs"; $EmailSentFromDokeos = "E-Mail wurde vom Portal versendet"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Informationen über den letzten beendeten und den nächsten unbeendeten Schritt."; $LatexCode = "LaTeX Code"; @@ -1087,7 +1078,7 @@ $YouAreRegisterToSessionX = "Sie sind registriert im Session-Kurs: %s."; $NextBis = "Weiter"; $Prev = "Zurück"; $Configuration = "Einstellungen"; -$ToGroup = "Zur Gruppe "; +$ToGroup = "Zur Gruppe"; $XWroteY = "%s schrieb:
    %s"; $BackToGroup = "Zurück zur Gruppe"; $GoAttendance = "Zu den Anwesenheiten"; @@ -1112,9 +1103,7 @@ $YouHaveANewMessageFromGroupX = "Sie haben eine neue Nachricht aus der Gruppe % $YouHaveANewMessageFromX = "Sie haben eine neue Nachricht von %s"; $SeeMessage = "Nachrichten ansehen"; $SeeInvitation = "Einladungen ansehen"; -$YouHaveReceivedThisNotificationBecauseYouAreSubscribedOrInvolvedInItToChangeYourNotificationPreferencesPleaseClickHereX = "Sie erhalten diese Benachrichtigung, weil Sie eingetragen oder beteiligt sind. -Um Ihre Benachrichtigunsgeinstellungen zu ändern, klicken Sie bitte hier: -%s"; +$YouHaveReceivedThisNotificationBecauseYouAreSubscribedOrInvolvedInItToChangeYourNotificationPreferencesPleaseClickHereX = "Sie erhalten diese Benachrichtigung, weil Sie eingetragen oder beteiligt sind. \nUm Ihre Benachrichtigunsgeinstellungen zu ändern, klicken Sie bitte hier: \n%s"; $Replies = "Antworten"; $Reply = "Antwort"; $Broken = "Defekt"; @@ -1132,4 +1121,5 @@ $CertificateOnlineLink = "Link zum Zertifikat"; $NewExercises = "Neue Tests"; $MyAverage = "Mein Durchschnitt"; $AllAttempts = "Alle Versuche"; +$GoToCourse = "gehe zu Kurs"; ?> \ No newline at end of file diff --git a/main/lang/greek/trad4all.inc.php b/main/lang/greek/trad4all.inc.php index a10828b776..214130b828 100644 --- a/main/lang/greek/trad4all.inc.php +++ b/main/lang/greek/trad4all.inc.php @@ -144,7 +144,6 @@ $langNameOfLang['thai'] = "ôáúëáíäÝæéêá"; $langNameOfLang['turkce'] = "ôïõñêéêÜ"; $UserInfo = "πληροφορίες χρήστη"; $langModifyQuestion = "Μετατροπή μιας ερώτησης"; -$langNameOfLang = "Όνομα γλώσσας"; $langNbAnnoucement = "Ανακοίνωση"; $lang_no_access_here = "Δεν επιτρέπεται η πρόσβαση εδώ"; $langOtherCourses = "άλλα μαθήματα"; diff --git a/main/lang/hungarian/trad4all.inc.php b/main/lang/hungarian/trad4all.inc.php index d8bd2c3547..9d12db4ecb 100644 --- a/main/lang/hungarian/trad4all.inc.php +++ b/main/lang/hungarian/trad4all.inc.php @@ -201,7 +201,6 @@ $langNameOfLang['turkce'] = "török"; $langNameOfLang['vietnamese'] = "vietnámi"; $UserInfo = "Felhasználói információ"; $langModifyQuestion = "Kérdés módosítása"; -$langNameOfLang = "Nyelv"; $langCheckAll = "Összes ellenőrzése"; $langNbAnnoucement = "Bejelentés"; $lang_no_access_here = "Itt nincs belépés"; diff --git a/main/lang/indonesian/trad4all.inc.php b/main/lang/indonesian/trad4all.inc.php index fb2a9a3f3b..4a599c064f 100644 --- a/main/lang/indonesian/trad4all.inc.php +++ b/main/lang/indonesian/trad4all.inc.php @@ -157,7 +157,6 @@ $langNameOfLang['turkce'] = "turki"; $langNameOfLang['vietnamese'] = "vietnam"; $UserInfo = "informasi user"; $langModifyQuestion = "Ubah pertanyaan"; -$langNameOfLang = "Nama bahasa"; $langCheckAll = "Conteng semua"; $langNbAnnoucement = "Pengumuman"; $lang_no_access_here = "Tidak ada akses disini"; diff --git a/main/lang/italian/trad4all.inc.php b/main/lang/italian/trad4all.inc.php index 3d370be62f..f2300b7599 100644 --- a/main/lang/italian/trad4all.inc.php +++ b/main/lang/italian/trad4all.inc.php @@ -203,7 +203,6 @@ $langNameOfLang['turkce'] = "Turco"; $langNameOfLang['vietnamese'] = "Vietnamita"; $UserInfo = "informazioni sull'utente"; $langModifyQuestion = "Modifica il quesito"; -$langNameOfLang = "Yome della lingua"; $langCheckAll = "Seleziona tutto"; $langNbAnnoucement = "Avviso"; $lang_no_access_here = "Nessun accesso"; diff --git a/main/lang/korean/trad4all.inc.php b/main/lang/korean/trad4all.inc.php index 88f6252377..f56f9ce083 100644 --- a/main/lang/korean/trad4all.inc.php +++ b/main/lang/korean/trad4all.inc.php @@ -142,7 +142,6 @@ $langNameOfLang['turkce'] = "turkish"; $langNameOfLang['vietnamese'] = "vietnamese"; $UserInfo = "유저 정보"; $langModifyQuestion = "문제 수정"; -$langNameOfLang = "언어"; $langNbAnnoucement = "공지사항"; $lang_no_access_here = "액세스한 사람이 없습니다"; $langOtherCourses = "다른 과정들"; diff --git a/main/lang/latvian/trad4all.inc.php b/main/lang/latvian/trad4all.inc.php index ed36e9c71f..195b1a1e14 100644 --- a/main/lang/latvian/trad4all.inc.php +++ b/main/lang/latvian/trad4all.inc.php @@ -2,7 +2,9 @@ /* for more information: see languages.txt in the lang folder. */ +$ThisItemIsInvisibleForStudentsButYouHaveAccessAsTeacher = "Šis postenis skolēniem ir neredzams, bet Jums, kā skolotājam ir pieejams"; $DeleteAllAttendances = "Dzēst visu klātienes reģistru"; +$Unsubscribe = "Atrakstīties"; $SearchXapianModuleNotInstalled = "Xapian meklēšanas modulis nav instalēts"; $Title = "Virsraksts"; $By = "Autors"; @@ -203,7 +205,6 @@ $langNameOfLang['turkce'] = "turku"; $langNameOfLang['vietnamese'] = "vjetnamiešu"; $UserInfo = "Informācija par lietotāju"; $langModifyQuestion = "Saglabāt jautājumu"; -$langNameOfLang = "Valodas nosaukums"; $langCheckAll = "Atzīmēt visus"; $langNbAnnoucement = "Paziņojums"; $lang_no_access_here = "JUMS NAV PIEEJAS TIESĪBU!"; @@ -733,6 +734,7 @@ $Until = "Līdz"; $FirstPage = "Pirmā lapa"; $LastPage = "Pēdējā lapa"; $Coachs = "Mācību spēki"; +$DragAndDropAnElementHere = "Vilkt un nomest elementu šeit"; $ThereAreNoRegisteredDatetimeYet = "Šeit vēl nav datuma / laika reģistra"; $CalendarList = "Plānoto Klātienes nodarbību diena un laiks"; $AttendanceCalendarDescription = "
    Klātienes nodarbību kalendārs, hronoloģiskā uzskaites veidā, ļauj reģistrēt Kursantu klātbūtni šī kursa klātienes nodarbībās.
    Lai izveidotu aktivitātes reģistru, ir nepieciešams vismaz viens reāls Kursants nodarbībā.
    Pievienot nodarbībai laiku un datumu, var izmantojot augstāk novietoto pogu - Pievienot datumu un laiku"; @@ -1062,6 +1064,7 @@ $CourseCodeAlreadyExistExplained = "Datu bāzes sistēma pārbauda kursa kodu, v $CantDeleteReadonlyFiles = "Nevar izdzēst failu, kas konfigurēts tikai lasīšanas režīmā"; $Uploaded = "Augšupielādēts"; $Saved = "Saglabāts"; +$Reset = "Atiestatīt"; $EmailSentFromDokeos = "E - vēstule, no platformas ir nosūtīta"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Informācija par pēdējo pabeigto soli un nākošo nepabeigto soli"; $LatexCode = "LaTEX kods"; @@ -1133,6 +1136,9 @@ $CertificateOnlineLink = "Links tiešsaistes sertifikācijai"; $NewExercises = "Jauni uzdevumi"; $MyAverage = "Mani vidējie"; $AllAttempts = "Visi mēģinājumi"; +$NoCookies = "Jūsu pārlūkprogrammā nav iespējots sīkfailu atbalsts. Chamilo balstās uz tā saukto sīkdatņu (cookies) funkcijām, lai saglabātu Jūsu savienojumu detaļas. Tas nozīmē, ka jūs nevarēsiet ielogoties, ja sīkfaili nav iespējoti. Lūdzu, nomainiet pārlūkprogrammu konfigurāciju (parasti izvēlē Edit -> Preferences) un pārlādējiet šo lapu."; +$NoJavascript = "Jūsu pārlūkprogrammā nav iespējots JavaScript atbalsts . Chamilo lielā mērā ir atkarīga no JavaScript, lai nodrošinātu Jūs ar dinamiskāku interfeisu. Ir iespējams, ka vairums funkciju darbosies, taču jūs nevarēsiet izmantot jaunākos uzlabojumu izmantojamību. Mēs iesakām Jums mainīt jūsu pārlūka konfigurāciju, (parasti izvēlē Edit -> Preferences) un pārlādēt šo lapu."; +$NoFlash = "Jūsu pārlūkprogrammā nav iespējots Flash atbalsts. Chamilo atsaucas tikai uz Flash. Ja Jūs vēlaties gūt labumu no Chamilo instrumentu komplekta, mēs iesakām Jums instalēt Flash spraudni un pārstartēt Jūsu pārlūkprogrammu."; $Attempt = "Mēģinājums"; $SaveForNow = "Saglabāt un turpināt vēlāk"; $NoQuicktime = "Jūsu pārlūkprogrammā nav instalēts QuickTime spraudnis. Jūs joprojām varat izmantot šo platformu, bet lai izpildītu lielāku skaitu mediju failus, mēs iesakām to uzinstalēt."; @@ -1145,5 +1151,160 @@ $SeeResults = "Skatīt rezultātus"; $Loading = "Ielādēt"; $AreYouSureToRestore = "Vai tiešām vēlaties atjaunot šo elementu?"; $ThisIsAutomaticEmailNoReply = "Šis ir automātiskā e-pasta ziņojums. Lūdzu, neatbildiet uz to."; +$PersonalCalendar = "Personālais kalendārs"; +$SkillsTree = "Prasmju koks"; +$Skills = "Prasmes"; +$SkillsProfile = "Prasmju profili"; +$WithCertificate = "Ar sertifikātiem"; +$AdminCalendar = "Administratora kalendārs"; +$CourseCalendar = "Kursa kalendārs"; +$Reports = "Atskaites"; +$dateFormatShortNumber = "%m/%d/%Y"; +$dateTimeFormatLong24H = "%B %d, %Y at %H:%M"; +$GradingModelTitle = "Vērtēšanas modelis"; +$Discussions = "Diskusijas"; +$GradeModel = "Vērtēšanas modelis"; +$ViewSkillsTree = "Skatīt prasmju koku"; $MySkills = "Manas prasmes"; +$SeeFile = "Skatīt failu"; +$UserList = "Lietotāju saraksts"; +$SearchUsers = "Meklēt Lietotājus"; +$Administration = "Administrācija"; +$SkillsAndGradebooks = "Prasmes un novērtējums"; +$AddSkill = "Pievienot prasmi"; +$AcceptLegal = "Pieņemt juridisku vienošanos"; +$CourseLegalAgreement = "Juridiska vienošanās šim kursam"; +$SkillDoesNotExist = "Nav tādu prasmju"; +$SkillRootName = "Absolūtās prasmes"; +$Option = "Opcija"; +$Updates = "Atjauninājumi"; +$Teaching = "Mācību"; +$CoursesReporting = "Kursu atskaites"; +$AdminReports = "Administrācijas atskaites"; +$ExamsReporting = "Eksāmenu atskaites"; +$MyReporting = "Manas atskaites"; +$SearchSkills = "Meklēt prasmes"; +$SaveThisSearch = "Saglabāt šo meklējumu"; +$SkillProfiles = "Saglabātie prasmju profili"; +$Matches = "Sakritības"; +$WelcomeUserXToTheSiteX = "%s, laipni aicināti %s"; +$CheckUsersWithId = "Lai pierakstītu Lietotāju izmantot Lietotāja ID no faila"; +$MB = "MB"; +$SessionList = "Sesiju saraksts"; +$StudentList = "Lietotāju saraksts"; +$GroupReply = "Atkārtot"; +$GroupReplies = "Atbildes"; +$SkillNotFound = "Prasmes nav atrastas"; +$IHaveThisSkill = "Man piemīt šī prasme"; +$Me = "Man"; +$Vote = "Balsot"; +$Votes = "Balsojumi"; +$XStarsOutOf5 = "%s zvaigznes no 5"; +$Visit = "Apmeklējumi"; +$Visits = "Apmeklējumi"; +$YourVote = "Tava balss"; +$HottestCourses = "Vispopulārākie kursi"; +$SentAtX = "Nosūtīti: %s"; +$dateTimeFormatShort = "%b %d, %Y at %I:%M %p"; +$dateTimeFormatShortTimeFirst = "%I:%M %p, %b %d %Y"; +$LoginToVote = "Pieteikties balsojumam"; +$DoNotShow = "Nerādīt"; +$ShowToAdminsOnly = "Rādīt tikai Administrācijai"; +$ShowToAdminsAndTeachers = "Rādīt Administrācijai un skolotājiem"; +$ShowToAllUsers = "Rādīt visiem Lietotājiem"; +$SelectAnAction = "Izvēlieties darbību"; +$LoginX = "Ielogoties: %s"; +$ChatConnected = "Čats (Savienots)"; +$ChatDisconnected = "Čats (Atvienots)"; +$ThingsToDo = "Lietas, kuras darīt nākošās"; +$WamiFlashDialog = "Tas būs redzams, kā dialoglodziņš, kas lūgs Jūsu atļauju piekļūt mikrofonam, atbildiet Jā un aizveriet dialoglodziņu. (Ja jūs nevēlaties, lai tas parādās atkal, pirms aizvēršanas atzīmējiet - atcerēties)"; +$WamiStartRecorder = "Sāciet ierakstīšanu, nospiežot mikrofona ikonu un apturiet to, nospiežot ikonu vēlreiz. Katru reizi, kad jūs to izdarīsiet, tiks radīts fails."; +$InputNameHere = "Ierakstiet vārdu šeit"; +$Reload = "Pārlādēt"; +$TimeSpentLastXDays = "Laiks, kas pavadīts iepriekšējās %s dienās"; +$TimeSpentBetweenXAndY = "Laiks, kas pavadīts starp %s un %s"; +$GoToCourse = "Doties uz kursu"; +$SubTotal = "Starpsumma"; +$Configure = "Konfigurēt"; +$Regions = "Reģions"; +$CourseList = "Kursu saraksts"; +$NumberAbbreviation = "Nr."; +$FirstnameAndLastname = "Vārds un Uzvārds"; +$LastnameAndFirstname = "Uzvārds un Vārds"; +$Plugins = "Spraudņi"; +$Detailed = "Detalizēti"; +$ResourceLockedByGradebook = "Šī opcija nav pieejama, jo šī darbība ir iekļauta novērtējuma instrumentā, kas šobrīd ir izslēgts. Lai aktivizētu novērtējumu, jautājiet savam platformas administratoram."; +$ConfirmToLockElement = "Vai tiešām vēlaties bloķēt šo vienumu? Pēc šī vienuma slēgšanas, nevarēs rediģēt lietotāja rezultātus. Lai to atbloķētu, jums būs jāsazinās ar platformu administratoru"; +$ConfirmToUnLockElement = "Vai tiešām vēlaties atslēgt šo vienumu?"; +$Default = "Pēc noklusējuma"; +$ReturnToCourseHomepage = "Atgriezties Kursa mājaslapā"; +$WebCamClip = "WebCam klips"; +$Snapshot = "Momentuzņēmums"; +$TakeYourPhotos = "Veiciet savas fotogrāfijas"; +$LocalInputImage = "Vietējā attēlu ievade"; +$ClipSent = "Klips nosūtīts"; +$Auto = "Auto"; +$Stop = "Stop"; +$YouHaveSomeUnsavedChanges = "Jums ir dažas nesaglabātās izmaiņas. Vai jūs vēlaties atteikties no viņām?"; +$ActivateEvent = "Aktivizēt notikumu"; +$AvailableEventKeys = "Pieejamie notikumu taustiņi. Izmantojiet tos starp (( ))."; +$Events = "Notikumi"; +$EventTypeName = "Notikuma veida nosaukums"; +$ExportToPDFOnlyHTMLAndImages = "Eksportēt tīmekļa lapas un attēlus uz PDF"; +$CourseCatalog = "Kursa katalogs"; +$Go = "Doties"; +$ImportThematic = "Importēt kursa progresu"; +$ExportThematic = "Eksportēt kursa progresu"; +$DeleteAllThematic = "Izdzēst visu kursa progresu"; +$ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation = "Šī platforma nevar sūtīt e-pastu. Plašākai informācijai,lūdzu, sazinieties ar %s ."; +$FirstLoginChangePassword = "Šī ir Jūsu pirmā pieteikšanās. Lūdzu, atjauniniet savu paroli, izveidojot to,izmantojiet tādus elementus, lai tos jūs spētu atcerēties pēc kāda laika."; +$NeedContactAdmin = "Noklikšķiniet šeit, lai sazinātos ar administratoru"; +$MarkAll = "Iezīmēt visu"; +$UnmarkAll = "Noņemt iezīmējumu visam"; +$NotAuthorized = "Nav piekļuves tiesību"; +$UnknownAction = "Nezināma aktivitāte"; +$First = "Pirmais"; +$Last = "Pēdējais"; +$YouAreNotAuthorized = "Jums nav atļauts to darīt"; +$NoImplementation = "Šai darbībai, neviena īstenošana vēl nav pieejama"; +$ReplaceExistingEntries = "Aizstāt esošos ierakstus"; +$AddItems = "Pievienot vienumus"; +$NotFound = "Nav atrasts"; +$SentSuccessfully = "Veiksmīgi nosūtīts"; +$SentFailed = "Nosūtīt neizdevās"; +$PortalSessionsLimitReached = "Sesiju ierobežojumu skaits šajā portālā ir sasniegts"; +$ANewSessionWasCreated = "Jauna sesija ir izveidota"; +$Online = "Tiešsaiste"; +$Offline = "Bezsaistē"; +$TimelineItemText = "Teksts"; +$TimelineItemMedia = "Mediji"; +$TimelineItemMediaCaption = "Virsraksts"; +$TimelineItemMediaCredit = "Punkti"; +$TimelineItemTitleSlide = "Slīdņa nosaukums"; +$SSOError = "Individuālo pierakstu kļūdas"; +$Sent = "Nosūtīts"; +$TimelineItem = "Vienums"; +$Listing = "Klausīties"; +$CourseRssTitle = "Kursa RSS"; +$CourseRssDescription = "RSS saite visiem kursu paziņojumiem"; +$AllowPublicCertificates = "Lietotāju apliecības ir publiskotas"; +$PortalHomepageEdited = "Portāla mājaslapa ir atjaunināta"; +$UserRegistrationTitle = "Lietotāja reģistrācija"; +$UserRegistrationComment = "Aktivizētās darbības, kad lietotājs reģistrējas platformā"; +$Disabled = "Atspējots"; +$Required = "Nepieciešams"; +$CategorySaved = "Kategorija saglabāta"; +$CategoryRemoved = "Kategorija ir noņemta"; +$BrowserDoesNotSupportNanogongPlayer = "Jūsu pārlūkprogramma neatbalsta Nanogong atskaņotāju"; +$ImportCSV = "Importēt CSV"; +$DataTableLengthMenu = "Tabulas garums"; +$DataTableZeroRecords = "Ieraksti nav atrasti"; +$MalformedUrl = "Slikti veidojas URL"; +$DataTableInfo = "Info"; +$DataTableInfoEmpty = "Tukšs"; +$DataTableInfoFiltered = "Atfiltrēts"; +$DataTableSearch = "Meklēt"; +$HideColumn = "Slēpt kolonu"; +$DisplayColumn = "Rādīt kolonu"; +$LegalAgreementAccepted = "Tiesiskais līgums pieņemts"; ?> \ No newline at end of file diff --git a/main/lang/lithuanian/trad4all.inc.php b/main/lang/lithuanian/trad4all.inc.php index e0b0b5c77d..4d26335258 100644 --- a/main/lang/lithuanian/trad4all.inc.php +++ b/main/lang/lithuanian/trad4all.inc.php @@ -160,7 +160,6 @@ $langUsers = "Vartotojai"; $langPlatformAdmin = "Sistemos administravimas"; $UserInfo = "vartotojo informacija"; $langModifyQuestion = "Redaguoti klausimą"; -$langNameOfLang = "Kalbos pavadinimas"; $langCheckAll = "Tikrinti viską"; $langNbAnnoucement = "Skelbimas"; $lang_no_access_here = "Nėra priėjimo"; diff --git a/main/lang/macedonian/trad4all.inc.php b/main/lang/macedonian/trad4all.inc.php index fd12fdf182..b3a51b0dad 100644 --- a/main/lang/macedonian/trad4all.inc.php +++ b/main/lang/macedonian/trad4all.inc.php @@ -193,7 +193,6 @@ $langNameOfLang['turkce'] = "турски"; $langNameOfLang['vietnamese'] = "виетнамски"; $UserInfo = "информација за корисникот"; $langModifyQuestion = "Измени го прашањето"; -$langNameOfLang = "Име на јазикот"; $langCheckAll = "Маркирај се'"; $langNbAnnoucement = "Соопштение"; $lang_no_access_here = "Немате пристап тука"; diff --git a/main/lang/norwegian/trad4all.inc.php b/main/lang/norwegian/trad4all.inc.php index 3efe35fe2e..d5a1f46792 100644 --- a/main/lang/norwegian/trad4all.inc.php +++ b/main/lang/norwegian/trad4all.inc.php @@ -152,7 +152,6 @@ $langNameOfLang['thai'] = "thailandsk"; $langNameOfLang['turkce'] = "tyrkisk"; $langNameOfLang['vietnamese'] = "vietnamesisk"; $UserInfo = "Brukerinformasjon"; -$langNameOfLang = "Navn på språk"; $langCheckAll = "Velg alle"; $langNbAnnoucement = "Annonsering"; $lang_no_access_here = "Ingen adgang her"; diff --git a/main/lang/occitan/trad4all.inc.php b/main/lang/occitan/trad4all.inc.php index c807f0f169..fbde1808db 100644 --- a/main/lang/occitan/trad4all.inc.php +++ b/main/lang/occitan/trad4all.inc.php @@ -111,7 +111,6 @@ $langOnLine = "En linha"; $langUsers = "Usanciers"; $UserInfo = "Informacions de l'usancier"; $langModifyQuestion = "Modificar la demanda"; -$langNameOfLang = "Nom de la lenga"; $langCheckAll = "Tot verificar"; $langNbAnnoucement = "Anóncia"; $lang_no_access_here = "Ges d'accès"; diff --git a/main/lang/persian/trad4all.inc.php b/main/lang/persian/trad4all.inc.php index dbba6f97d6..b4eada6834 100644 --- a/main/lang/persian/trad4all.inc.php +++ b/main/lang/persian/trad4all.inc.php @@ -156,7 +156,6 @@ $langNameOfLang['turkce'] = "ترکی"; $langNameOfLang['vietnamese'] = "ویتنامی"; $UserInfo = "فهرست اعضا"; $langModifyQuestion = "تغییر سؤال"; -$langNameOfLang = "زبان"; $langCheckAll = "انتخاب همه"; $langNbAnnoucement = "اطلاعیه ها"; $lang_no_access_here = "دسترسی\nغیرممکن است"; diff --git a/main/lang/polish/trad4all.inc.php b/main/lang/polish/trad4all.inc.php index a2a7abe97b..92cd476dc4 100644 --- a/main/lang/polish/trad4all.inc.php +++ b/main/lang/polish/trad4all.inc.php @@ -190,7 +190,6 @@ $langNameOfLang['thai'] = "tajski"; $langNameOfLang['turkce'] = "turecki"; $langNameOfLang['vietnamese'] = "wietnamski"; $UserInfo = "dane użytkownika"; -$langNameOfLang = "Nazwa języka"; $langCheckAll = "Zaznacz wszystkie"; $langNbAnnoucement = "Ogłoszenie"; $lang_no_access_here = "Nie ma dostępu"; diff --git a/main/lang/portuguese/trad4all.inc.php b/main/lang/portuguese/trad4all.inc.php index 6323ca1fef..16c839ce6d 100644 --- a/main/lang/portuguese/trad4all.inc.php +++ b/main/lang/portuguese/trad4all.inc.php @@ -201,7 +201,6 @@ $langNameOfLang['turkce'] = "turco"; $langNameOfLang['vietnamese'] = "vietnamita"; $UserInfo = "informação do utilizador"; $langModifyQuestion = "Guardar a pergunta"; -$langNameOfLang = "iome do idioma"; $langCheckAll = "Verificar todos"; $langNbAnnoucement = "Anúncio"; $lang_no_access_here = "Sem acesso aqui"; diff --git a/main/lang/quechua_cusco/trad4all.inc.php b/main/lang/quechua_cusco/trad4all.inc.php index 6fe5377f85..52dc96b468 100644 --- a/main/lang/quechua_cusco/trad4all.inc.php +++ b/main/lang/quechua_cusco/trad4all.inc.php @@ -168,7 +168,6 @@ $langUsers = "Haykuqmasikuna"; $langPlatformAdmin = "Hanp'araq kamachina"; $UserInfo = "haykuqmasimanta willay"; $langModifyQuestion = "T'ijrapay taputa"; -$langNameOfLang = "himimanta sutin"; $langCheckAll = "cheqaqchay"; $langNbAnnoucement = "Willaykuna"; $lang_no_access_here = "Manan kayman haykuwaqchu"; diff --git a/main/lang/romanian/trad4all.inc.php b/main/lang/romanian/trad4all.inc.php index a0075ba201..fea513815f 100644 --- a/main/lang/romanian/trad4all.inc.php +++ b/main/lang/romanian/trad4all.inc.php @@ -200,7 +200,6 @@ $langNameOfLang['turkce'] = "turkish"; $langNameOfLang['vietnamese'] = "vietnamese"; $UserInfo = "informatii despre utilizator"; $langModifyQuestion = "Modifica intrebarea"; -$langNameOfLang = "Numele limbii"; $langCheckAll = "Bifeaza toate"; $langNbAnnoucement = "Anunt"; $lang_no_access_here = "Nu aveti acces aici"; diff --git a/main/lang/russian/trad4all.inc.php b/main/lang/russian/trad4all.inc.php index 7137ce7ec0..fb6ff2f41e 100644 --- a/main/lang/russian/trad4all.inc.php +++ b/main/lang/russian/trad4all.inc.php @@ -194,7 +194,6 @@ $langNameOfLang['turkce'] = "турецкий"; $langNameOfLang['vietnamese'] = "вьетнамский"; $UserInfo = "информация пользователя"; $langModifyQuestion = "Изменить вопрос"; -$langNameOfLang = "Название языка"; $langCheckAll = "Проверить все"; $langNbAnnoucement = "Объявление"; $lang_no_access_here = "Здесь доступа нет"; diff --git a/main/lang/serbian/trad4all.inc.php b/main/lang/serbian/trad4all.inc.php index be626dff1e..c6a4350938 100644 --- a/main/lang/serbian/trad4all.inc.php +++ b/main/lang/serbian/trad4all.inc.php @@ -164,7 +164,6 @@ $langNameOfLang['turkce'] = "turski"; $langNameOfLang['vietnamese'] = "vijetnamski"; $UserInfo = "informacija o korisniku"; $langModifyQuestion = "Izmena putanja"; -$langNameOfLang = "ume jezika"; $langCheckAll = "Proveri sve"; $langNbAnnoucement = "Obaveštenje"; $lang_no_access_here = "Nije dozvoljen pristup"; diff --git a/main/lang/simpl_chinese/trad4all.inc.php b/main/lang/simpl_chinese/trad4all.inc.php index 996318a201..7a2d4cd34d 100644 --- a/main/lang/simpl_chinese/trad4all.inc.php +++ b/main/lang/simpl_chinese/trad4all.inc.php @@ -202,7 +202,6 @@ $langNameOfLang['turkce'] = "土耳其语"; $langNameOfLang['vietnamese'] = "越南语"; $UserInfo = "用户信息"; $langModifyQuestion = "修改题目"; -$langNameOfLang = "语言名称"; $langCheckAll = "全部选定"; $langNbAnnoucement = "通知"; $lang_no_access_here = "不开放"; diff --git a/main/lang/slovak/trad4all.inc.php b/main/lang/slovak/trad4all.inc.php index 4d1b39e5b0..2e5bfd16dd 100644 --- a/main/lang/slovak/trad4all.inc.php +++ b/main/lang/slovak/trad4all.inc.php @@ -201,7 +201,6 @@ $langNameOfLang['turkce'] = "turecky"; $langNameOfLang['vietnamese'] = "vietnamsky"; $UserInfo = "informácie o používateľovi"; $langModifyQuestion = "Zmeniť otázku"; -$langNameOfLang = "yázov jazyka"; $langCheckAll = "zaškrtni všetko"; $langNbAnnoucement = "Oznam"; $lang_no_access_here = "Bez prístupu"; diff --git a/main/lang/slovenian/trad4all.inc.php b/main/lang/slovenian/trad4all.inc.php index b5b94f3678..234a2afed1 100644 --- a/main/lang/slovenian/trad4all.inc.php +++ b/main/lang/slovenian/trad4all.inc.php @@ -2,7 +2,9 @@ /* for more information: see languages.txt in the lang folder. */ +$ThisItemIsInvisibleForStudentsButYouHaveAccessAsTeacher = "Ta posnetek je neviden za tečajnike. Do njih lahko dostopite kot učitelj."; $DeleteAllAttendances = "Odstrani vso obstoječo prisotnost"; +$Unsubscribe = "Izpiši se"; $SearchXapianModuleNotInstalled = "Xapian iskalni modul ni nameščen"; $Title = "Naslov"; $By = "Objavil"; @@ -203,7 +205,6 @@ $langNameOfLang['turkce'] = "turkish"; $langNameOfLang['vietnamese'] = "vietnamese"; $UserInfo = "informacije o uporabniku"; $langModifyQuestion = "Shrani vprašanje"; -$langNameOfLang = "ime jezika"; $langCheckAll = "Izberi vse"; $langNbAnnoucement = "Obvestilo"; $lang_no_access_here = "Tu ni dostopa"; @@ -730,6 +731,7 @@ $Until = "Do"; $FirstPage = "Prva stran"; $LastPage = "Zadnja stran"; $Coachs = "Coach-i"; +$DragAndDropAnElementHere = "Povleci in izpusti element tule"; $ThereAreNoRegisteredDatetimeYet = "Trenutni ni nobenega registriranega datuma/časa"; $CalendarList = "Koledarski seznam prisotnosti"; $AttendanceCalendarDescription = "Koledar prisotnosti omogoča registracijo spiska prisotnosti (po eno na obstoječo sejo/uro, ki ji mora tečajnik prisostvovati). Dodaj nov spisek prisotnosti tule."; @@ -1231,4 +1233,12 @@ $Detailed = "Podrobno"; $ResourceLockedByGradebook = "Ta možnost ni dostopna, ker je ta aktivnost vsebovana v nalogi/objavi, ki je trenutno zaklenjena. Za odklepanje naloge se obrnite na upravitelja platforme."; $ConfirmToLockElement = "Ste prepričani, da želite zakleniti ta element? Po zaklepanju tega elementa ne bo več mogoče urejati tečajnikovih rezultatov. Za odklepanje boste naknadno morali zaprositi upravitelja platforme."; $ConfirmToUnLockElement = "Ste prepričani, da želite odkleniti ta element?"; +$Default = "Privzeto"; +$ReturnToCourseHomepage = "Na domačo stran tečaja"; +$WebCamClip = "Posnetek s spletne kamere"; +$Snapshot = "Posnetek"; +$LocalInputImage = "Lokalna slika"; +$ClipSent = "Posnetek je bil poslan"; +$Auto = "Avtomatično"; +$Stop = "Zaustavi"; ?> \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index d43b36414c..c3d55512bf 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -205,7 +205,6 @@ $langNameOfLang['turkce'] = "turco"; $langNameOfLang['vietnamese'] = "vietnamita"; $UserInfo = "información del usuario"; $langModifyQuestion = "Modificar pregunta"; -$langNameOfLang = "yombre del idioma"; $langCheckAll = "comprobar"; $langNbAnnoucement = "Avisos"; $lang_no_access_here = "No tiene autorización para acceder aquí"; @@ -1206,7 +1205,7 @@ $XStarsOutOf5 = "%s estrellas de 5"; $Visit = "Visita"; $Visits = "Visitas"; $YourVote = "Su voto"; -$HottestCourses = "Cursos con mayor prestigio"; +$HottestCourses = "Cursos más populares"; $SentAtX = "Enviado el: %s"; $dateTimeFormatShort = "%b %d, %Y at %I:%M %p"; $dateTimeFormatShortTimeFirst = "%I:%M %p, %b %d %Y"; diff --git a/main/lang/spanish_latin/trad4all.inc.php b/main/lang/spanish_latin/trad4all.inc.php index 7a43dd1b9a..248d76b6c1 100644 --- a/main/lang/spanish_latin/trad4all.inc.php +++ b/main/lang/spanish_latin/trad4all.inc.php @@ -166,7 +166,6 @@ $langNameOfLang['turkce'] = "turco"; $langNameOfLang['vietnamese'] = "vietnamita"; $UserInfo = "información de usuario"; $langModifyQuestion = "Modificar una pregunta"; -$langNameOfLang = "Nombre del idioma"; $langCheckAll = "Marcar todo"; $langNbAnnoucement = "Avisos"; $lang_no_access_here = "Usted no tiene acceso aquí"; diff --git a/main/lang/swedish/trad4all.inc.php b/main/lang/swedish/trad4all.inc.php index 198c3c3930..c31d7fe989 100644 --- a/main/lang/swedish/trad4all.inc.php +++ b/main/lang/swedish/trad4all.inc.php @@ -201,7 +201,6 @@ $langNameOfLang['turkce'] = "turkiska"; $langNameOfLang['vietnamese'] = "vietnamesiska"; $UserInfo = "användarinformation"; $langModifyQuestion = "Ändra fråga"; -$langNameOfLang = "Språkets namn"; $langCheckAll = "Markera allt"; $langNbAnnoucement = "Tillkännagivande"; $lang_no_access_here = "Ingen access här"; diff --git a/main/lang/thai/trad4all.inc.php b/main/lang/thai/trad4all.inc.php index e75cea606a..2db77b7b34 100644 --- a/main/lang/thai/trad4all.inc.php +++ b/main/lang/thai/trad4all.inc.php @@ -157,7 +157,6 @@ $langNameOfLang['turkce'] = "µØáÕ"; $langNameOfLang['vietnamese'] = "àÇÕÂŽ¹ÒÁ"; $UserInfo = "ข้อมูลของผู้ใช้"; $langModifyQuestion = "ปรับ/แก้ไขคำถาม"; -$langNameOfLang = "ชื่อภาษา"; $langCheckAll = "เลือกทั้งหมด"; $langNbAnnoucement = "ประกาศ"; $lang_no_access_here = "ห้ามเข้า"; diff --git a/main/lang/trad_chinese/trad4all.inc.php b/main/lang/trad_chinese/trad4all.inc.php index 06ef6ac6eb..8cd1f09bdd 100644 --- a/main/lang/trad_chinese/trad4all.inc.php +++ b/main/lang/trad_chinese/trad4all.inc.php @@ -158,7 +158,6 @@ $langUsers = "用戶"; $langPlatformAdmin = "系統管理"; $UserInfo = "用戶訊息"; $langModifyQuestion = "修改題目"; -$langNameOfLang = "語言名稱"; $langCheckAll = "全部選定"; $langNbAnnoucement = "通知"; $lang_no_access_here = "不開放"; diff --git a/main/lang/turkish/trad4all.inc.php b/main/lang/turkish/trad4all.inc.php index d31340dab8..99ce4f6b92 100644 --- a/main/lang/turkish/trad4all.inc.php +++ b/main/lang/turkish/trad4all.inc.php @@ -178,7 +178,6 @@ $langNameOfLang['turkce'] = "Türkçe"; $langNameOfLang['vietnamese'] = "vietnamese"; $UserInfo = "kullanıcı bilgisi"; $langModifyQuestion = "Soruyu düzenle"; -$langNameOfLang = "Lisan ismi"; $langCheckAll = "Hepsini seç"; $langNbAnnoucement = "Duyuru"; $lang_no_access_here = "Erişim yetkiniz yok"; diff --git a/main/lang/ukrainian/trad4all.inc.php b/main/lang/ukrainian/trad4all.inc.php index 383d9899d6..4baf8a6520 100644 --- a/main/lang/ukrainian/trad4all.inc.php +++ b/main/lang/ukrainian/trad4all.inc.php @@ -184,7 +184,6 @@ $langNameOfLang['turkce'] = "турецьк&# $langNameOfLang['vietnamese'] = "в\'єтнамська"; $UserInfo = "інформація користувача"; $langModifyQuestion = "Змінити питання"; -$langNameOfLang = "Назва мови"; $langCheckAll = "Позначити всі"; $langNbAnnoucement = "Оголошення"; $lang_no_access_here = "Немає доступу"; From 0d54a31cecb265b3f0896a1afd787df726736c78 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 24 Jul 2012 19:07:30 +0200 Subject: [PATCH 4/6] Adding static in order to avoid PHP warnings --- main/inc/lib/database.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php index 24a0aec598..9231a3a97e 100644 --- a/main/inc/lib/database.lib.php +++ b/main/inc/lib/database.lib.php @@ -567,7 +567,7 @@ class Database { * @param resource $connection (optional) The database server connection, for detailed description see the method query(). * @return string/boolean Returns string data on success or FALSE on failure. */ - public function get_host_info($connection = null) { + public static function get_host_info($connection = null) { return self::use_default_connection($connection) ? mysql_get_host_info() : mysql_get_host_info($connection); } @@ -576,7 +576,7 @@ class Database { * @param resource $connection (optional) The database server connection, for detailed description see the method query(). * @return int/boolean Returns the protocol version on success or FALSE on failure. */ - public function get_proto_info($connection = null) { + public static function get_proto_info($connection = null) { return self::use_default_connection($connection) ? mysql_get_proto_info() : mysql_get_proto_info($connection); } @@ -585,7 +585,7 @@ class Database { * @param resource $connection (optional) The database server connection, for detailed description see the method query(). * @return string/boolean Returns the MySQL server version on success or FALSE on failure. */ - public function get_server_info($connection = null) { + public static function get_server_info($connection = null) { return self::use_default_connection($connection) ? mysql_get_server_info() : mysql_get_server_info($connection); } From 85178f5770a9f413cc3266b8b24e71414ca55a39 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 24 Jul 2012 19:17:50 +0200 Subject: [PATCH 5/6] Minor - Call-time pass-by-reference has been removed --- main/attendance/attendance_controller.php | 4 +--- main/newscorm/lp_list.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php index f74c08adda..61ee3c8c92 100644 --- a/main/attendance/attendance_controller.php +++ b/main/attendance/attendance_controller.php @@ -522,8 +522,6 @@ $head_table[] = $array_p2; */ //echo "
    "; print_r($head_table); echo "
    "; exit(); - - export_pdf_attendance(&$head_table, &$data_table, &$header_pdf, $footer_pdf, $title_pdf); - + export_pdf_attendance($head_table, $data_table, $header_pdf, $footer_pdf, $title_pdf); } } diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php index 6d2e4f3051..e6e226204b 100644 --- a/main/newscorm/lp_list.php +++ b/main/newscorm/lp_list.php @@ -46,8 +46,8 @@ api_protect_course_script(); */ /* Require the search widget and prepare the header with its stuff. */ if (api_get_setting('search_enabled') == 'true') { - require api_get_path(LIBRARY_PATH).'search/search_widget.php'; - search_widget_prepare(&$htmlHeadXtra); + require api_get_path(LIBRARY_PATH).'search/search_widget.php'; + search_widget_prepare($htmlHeadXtra); } Display::display_header($nameTools, 'Path'); $current_session = api_get_session_id(); From 89b0bdc9db9191da2e0f9d9060e540d4dca79f36 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 24 Jul 2012 19:54:00 +0200 Subject: [PATCH 6/6] Fixing course categories in index.php see #5249 --- index.php | 2 +- main/css/base_chamilo.css | 11 +- main/css/blue_lagoon/default.css | 11 +- main/css/cool_blue/default.css | 11 +- main/css/delicious_bordeaux/default.css | 11 +- main/css/dokeos_blue/default.css | 10 -- main/css/dokeos_classic/default.css | 10 -- main/css/dokeos_classic_2D/default.css | 15 -- main/css/empire_green/default.css | 10 -- main/css/fruity_orange/default.css | 11 +- main/css/medical/default.css | 10 -- main/css/public_admin/default.css | 11 +- main/css/royal_purple/default.css | 11 +- main/css/sober_brown/default.css | 11 +- main/css/steel_grey/default.css | 11 +- main/css/tasty_olive/default.css | 11 +- main/inc/lib/userportal.lib.php | 131 +++++++++--------- main/template/default/layout/layout_2_col.tpl | 27 ++-- 18 files changed, 95 insertions(+), 230 deletions(-) diff --git a/index.php b/index.php index 6ca2abff24..292e1d0d15 100644 --- a/index.php +++ b/index.php @@ -127,7 +127,7 @@ if (!empty($_POST['submitAuth'])) { } if (api_get_setting('display_categories_on_homepage') == 'true') { - $controller->tpl->assign('content', $controller->return_anonymous_course_list()); + $controller->tpl->assign('course_category_block', $controller->return_courses_in_categories()); } // Facebook connexion, if activated diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index b1dc14c7ec..8ccbf91886 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -499,16 +499,7 @@ a.nobold:hover { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: transparent; -} + .home_news { width: 45%; float: right; diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 6a73a9e18d..601effa102 100644 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -1159,16 +1159,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index d14e6e49c6..77be565e46 100644 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -1107,16 +1107,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css index 26512b01ef..a6ebc110a0 100644 --- a/main/css/delicious_bordeaux/default.css +++ b/main/css/delicious_bordeaux/default.css @@ -1119,16 +1119,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css index 3019e06942..79a4cbdcd8 100644 --- a/main/css/dokeos_blue/default.css +++ b/main/css/dokeos_blue/default.css @@ -1128,16 +1128,6 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} .home_news { width: 45%; float: right; diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index b02e8351f7..c99f718ff8 100644 --- a/main/css/dokeos_classic/default.css +++ b/main/css/dokeos_classic/default.css @@ -998,16 +998,6 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} .home_news { width: 45%; float: right; diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index c2e179c563..41e749cf21 100644 --- a/main/css/dokeos_classic_2D/default.css +++ b/main/css/dokeos_classic_2D/default.css @@ -1055,21 +1055,6 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* -============================================================================== - divs for category list / platform news on home page -============================================================================== -*/ - -.home_cats { - background: #fff; - float: left; - margin: 0; - padding: 0px; - padding-top: 8px; - position: relative; - width: 45%; -} .home_news { background: #fff; float: right; diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css index d3a373738f..28d8eeaaea 100644 --- a/main/css/empire_green/default.css +++ b/main/css/empire_green/default.css @@ -1117,16 +1117,6 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} .home_news { width: 45%; float: right; diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css index 6197ee717f..aacd02bc7b 100644 --- a/main/css/fruity_orange/default.css +++ b/main/css/fruity_orange/default.css @@ -1125,16 +1125,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/css/medical/default.css b/main/css/medical/default.css index 7d791fdf54..47f2545de9 100644 --- a/main/css/medical/default.css +++ b/main/css/medical/default.css @@ -1099,16 +1099,6 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: transparent; -} .home_news { width: 45%; float: right; diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index 4a6e2c8940..935657c0b3 100644 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -868,16 +868,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: transparent; -} + .home_news { width: 45%; float: right; diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css index 9423eb6e51..ba603f771e 100644 --- a/main/css/royal_purple/default.css +++ b/main/css/royal_purple/default.css @@ -1076,16 +1076,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index 16f4782abd..0b4f18392c 100644 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -760,16 +760,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: transparent; -} + .home_news { width: 45%; float: right; diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css index 02eb30e9d9..e9d771feec 100644 --- a/main/css/steel_grey/default.css +++ b/main/css/steel_grey/default.css @@ -1109,16 +1109,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index b327e9efe6..146a55542d 100644 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -1053,16 +1053,7 @@ span.form_error { margin: 0; padding: 4px 0 0 10px; } -/* divs for category list / platform news on home page */ -.home_cats { - width: 45%; - float: left; - position: relative; - margin: 0; - padding: 0px; - padding-top: 8px; - background: #fff; -} + .home_news { width: 45%; float: right; diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 261fe8be2c..4c8f4d7426 100644 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -342,8 +342,9 @@ class IndexManager { * * @version 1.1 * @author Patrick Cool , Ghent University - refactoring and code cleaning + * @author Julio Montoya , Beeznest template modifs */ - function return_anonymous_course_list() { + function return_courses_in_categories() { $result = ''; $ctok = $_SESSION['sec_token']; $stok = Security::get_token(); @@ -406,8 +407,7 @@ class IndexManager { GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name"; - // Showing only the category of courses of the current access_url_id. - global $_configuration; + // Showing only the category of courses of the current access_url_id if ($_configuration['multiple_access_urls']) { $url_access_id = api_get_current_access_url_id(); if ($url_access_id != -1) { @@ -427,10 +427,10 @@ class IndexManager { $resCats = Database::query($sqlGetSubCatList); $thereIsSubCat = false; if (Database::num_rows($resCats) > 0) { - $htmlListCat = '

    '.get_lang('CatList').'

      '; + $htmlListCat = Display::page_header(get_lang('CatList')); + $htmlListCat .= '
        '; while ($catLine = Database::fetch_array($resCats)) { - if ($catLine['code'] != $category) { - + if ($catLine['code'] != $category) { $category_has_open_courses = self::category_has_open_courses($catLine['code']); if ($category_has_open_courses) { // The category contains courses accessible to anonymous visitors. @@ -439,20 +439,20 @@ class IndexManager { if (api_get_setting('show_number_of_courses') == 'true') { $htmlListCat .= ' ('.$catLine['nbCourse'].' '.get_lang('Courses').')'; } - $htmlListCat .= "\n"; + $htmlListCat .= ""; $thereIsSubCat = true; } elseif ($catLine['children_count'] > 0) { // The category has children, subcategories. $htmlListCat .= '
      • '; $htmlListCat .= ''.$catLine['name'].''; - $htmlListCat .= "
        • \n"; + $htmlListCat .= ""; $thereIsSubCat = true; } /* End changed code to eliminate the (0 courses) after empty categories. */ elseif (api_get_setting('show_empty_course_categories') == 'true') { $htmlListCat .= '
      • '; $htmlListCat .= $catLine['name']; - $htmlListCat .= "
        • \n"; + $htmlListCat .= ""; $thereIsSubCat = true; } // Else don't set thereIsSubCat to true to avoid printing things if not requested. } else { @@ -463,11 +463,11 @@ class IndexManager { if (!is_null($catLine['parent_id']) || (api_get_setting('show_back_link_on_top_of_tree') != 'true' && !is_null($catLine['code']))) { $htmlTitre .= '<< '.get_lang('Up').''; } - $htmlTitre .= "

        \n"; + $htmlTitre .= "

        "; if ($category != "" && !is_null($catLine['code'])) { - $htmlTitre .= '

        '.$catLine['name']."

        \n"; + $htmlTitre .= '

        '.$catLine['name']."

        "; } else { - $htmlTitre .= '

        '.get_lang('Categories')."

        \n"; + $htmlTitre .= '

        '.get_lang('Categories')."

        "; } } } @@ -484,10 +484,9 @@ class IndexManager { $courses_list_string = ''; $courses_shown = 0; if ($numrows > 0) { - if ($thereIsSubCat) { - $courses_list_string .= "
        \n"; - } - $courses_list_string .= '

        '.get_lang('CourseList')."

        \n
          \n"; + + $courses_list_string .= Display::page_header(get_lang('CourseList')); + $courses_list_string .= "
            "; if (api_get_user_id()) { $courses_of_user = self::get_courses_of_user(api_get_user_id()); @@ -516,79 +515,79 @@ class IndexManager { $courses_list_string .= implode(' - ', $course_details); $courses_list_string .= "\n"; } - } - // We DO show the closed courses. - // The course is accessible if (link to the course homepage): - // 1. the course is open to the world (doesn't matter if the user is logged in or not): $course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD); - // 2. the user is logged in and the course is open to the world or open to the platform: ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM); - // 3. the user is logged in and the user is subscribed to the course and the course visibility is not COURSE_VISIBILITY_CLOSED; - // 4. the user is logged in and the user is course admin of te course (regardless of the course visibility setting); - // 5. the user is the platform admin api_is_platform_admin(). - // - else { - $courses_shown++; + } else { + // We DO show the closed courses. + // The course is accessible if (link to the course homepage): + // 1. the course is open to the world (doesn't matter if the user is logged in or not): $course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD); + // 2. the user is logged in and the course is open to the world or open to the platform: ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM); + // 3. the user is logged in and the user is subscribed to the course and the course visibility is not COURSE_VISIBILITY_CLOSED; + // 4. the user is logged in and the user is course admin of te course (regardless of the course visibility setting); + // 5. the user is the platform admin api_is_platform_admin(). + // + $courses_shown++; $courses_list_string .= "
          • \n"; if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD - || ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM) - || ($user_identified && key_exists($course['code'], $courses_of_user) && $course['visibility'] != COURSE_VISIBILITY_CLOSED) - || $courses_of_user[$course['code']]['status'] == '1' - || api_is_platform_admin()) { - $courses_list_string .= ''; - } - $courses_list_string .= $course['title']; - if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD + || ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM) + || ($user_identified && key_exists($course['code'], $courses_of_user) && $course['visibility'] != COURSE_VISIBILITY_CLOSED) + || $courses_of_user[$course['code']]['status'] == '1' + || api_is_platform_admin()) { + $courses_list_string .= ''; + } + $courses_list_string .= $course['title']; + if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD || ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM) || ($user_identified && key_exists($course['code'], $courses_of_user) && $course['visibility'] != COURSE_VISIBILITY_CLOSED) || $courses_of_user[$course['code']]['status'] == '1' || api_is_platform_admin()) { - $courses_list_string .= '
            '; - } - $course_details = array(); - if (api_get_setting('display_coursecode_in_courselist') == 'true') { - $course_details[] = $course['visual_code']; - } + $courses_list_string .= '
            '; + } + $course_details = array(); + if (api_get_setting('display_coursecode_in_courselist') == 'true') { + $course_details[] = $course['visual_code']; + } // if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') { // $courses_list_string .= ' - '; // } - if (api_get_setting('display_teacher_in_courselist') == 'true') { + if (api_get_setting('display_teacher_in_courselist') == 'true') { $course_details[] = $course['tutor_name']; } if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) { $course_details[] = $course['course_language']; } - if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) { + if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) { $course_details[] = $course['course_language']; } + $courses_list_string .= implode(' - ', $course_details); - // We display a subscription link if: + // We display a subscription link if: // 1. it is allowed to register for the course and if the course is not already in the courselist of the user and if the user is identiefied // 2. - if ($user_identified && !key_exists($course['code'], $courses_of_user)) { - if ($course['subscribe'] == '1') { - $courses_list_string .= '
            '; - $courses_list_string .= ''; - $courses_list_string .= ''; - $courses_list_string .= ''.get_lang('Subscribe').'
            '; - } else { - $courses_list_string .= '
            '.get_lang('SubscribingNotAllowed'); - } - } - $courses_list_string .= "
            • "; - } - } + if ($user_identified && !key_exists($course['code'], $courses_of_user)) { + if ($course['subscribe'] == '1') { + $courses_list_string .= '
            '; + $courses_list_string .= ''; + $courses_list_string .= ''; + $courses_list_string .= ''.get_lang('Subscribe').'
            '; + } else { + $courses_list_string .= '
            '.get_lang('SubscribingNotAllowed'); + } + } + $courses_list_string .= ""; + } //end else + } // end foreach $courses_list_string .= "
          "; - } else { - //$result .= '
          ', get_lang('_No_course_publicly_available'), "
          \n"; - } - if ($courses_shown > 0) { - // Only display the list of courses and categories if there was more than - // 0 courses visible to the world (we're in the anonymous list here). - $result .= $courses_list_string; - } + } else { + //$result .= '
          ', get_lang('_No_course_publicly_available'), "
          \n"; + } + if ($courses_shown > 0) { + // Only display the list of courses and categories if there was more than + // 0 courses visible to the world (we're in the anonymous list here). + $result .= $courses_list_string; + } if ($category != '') { $result .= '

          ' . Display :: return_icon('back.png', get_lang('BackToHomePage')) . get_lang('BackToHomePage') . '

          '; } - return '
          ' . $result . '
          '; + return $result; } /** diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl index 91bbce1238..a8dcb300dd 100644 --- a/main/template/default/layout/layout_2_col.tpl +++ b/main/template/default/layout/layout_2_col.tpl @@ -12,17 +12,17 @@
{% endif %} - {# ?? #} + {# Portal homepage #} {% if home_page_block %} -
+
- {{ home_page_block}} + {{ home_page_block }}
{% endif %} - + {# ?? #} {{ sniff_notification }} @@ -33,16 +33,27 @@ {{ content }}
{% endif %} - + {# Announcements #} {% if announcements_block %} -
+
{{ announcements_block }}
{% endif %} - + + {# Course categories (must be turned on in the admin settings) #} + {% if course_category_block %} +
+
+
+ {{ course_category_block }} +
+
+
+ {% endif %} + {# Hot courses template #} - {% include "default/layout/hot_courses.tpl" %} + {% include "default/layout/hot_courses.tpl" %} {# Content bottom #} {% if plugin_content_bottom %}