diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php index 37c3cf3a2c..c313020bad 100755 --- a/main/inc/lib/document.lib.php +++ b/main/inc/lib/document.lib.php @@ -1409,10 +1409,12 @@ class DocumentManager { $date_long_certificate = ''; if (!empty($date_certificate)) { $date_long_certificate = api_convert_and_format_date($date_certificate); + $date_no_time = api_convert_and_format_date($date_certificate, DATE_FORMAT_LONG_NO_DAY); } if ($is_preview) { $date_long_certificate = api_convert_and_format_date(api_get_utc_datetime()); + $date_no_time = api_convert_and_format_date(api_get_utc_datetime(), DATE_FORMAT_LONG_NO_DAY); } $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$info_grade_certificate['id']; @@ -1427,6 +1429,7 @@ class DocumentManager { $teacher_last_name, $official_code, $date_long_certificate, + $date_no_time, $course_id, $course_info['name'], $info_grade_certificate['grade'], @@ -1443,6 +1446,7 @@ class DocumentManager { '((teacher_lastname))', '((official_code))', '((date_certificate))', + '((date_certificate_no_time))', '((course_code))', '((course_title))', '((gradebook_grade))', diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php index 28cf7e6753..67bd412333 100644 --- a/main/inc/lib/internationalization.lib.php +++ b/main/inc/lib/internationalization.lib.php @@ -25,8 +25,9 @@ define('SPECIAL_CLOSING_TAG', '=]'); define('TIME_NO_SEC_FORMAT', 0); // 15:23 define('DATE_FORMAT_SHORT', 1); // Aug 25, 09 -define('DATE_FORMAT_LONG', 2); // Aug 25, 09 -define('DATE_TIME_FORMAT_LONG', 3); // August 25, 2009 at 03:28 PM +define('DATE_FORMAT_LONG', 2); // Monday August 25, 09 +define('DATE_FORMAT_LONG_NO_DAY', 10); // August 25, 2009 +define('DATE_TIME_FORMAT_LONG', 3); // Monday August 25, 2009 at 03:28 PM define('DATE_FORMAT_NUMBER', 4); // 25.08.09 define('DATE_TIME_FORMAT_LONG_24H', 5); // August 25, 2009 at 15:28 @@ -739,6 +740,13 @@ function api_format_date($time, $format = null, $language = null) { $timetype = IntlDateFormatter::SHORT; } break; + case DATE_FORMAT_LONG_NO_DAY: + $date_format = get_lang('dateFormatLongNoDay', '', $language); + if (IS_PHP_53 && INTL_INSTALLED) { + $datetype = IntlDateFormatter::FULL; + $timetype = IntlDateFormatter::SHORT; + } + break; case DATE_TIME_FORMAT_SHORT: $date_format = get_lang('dateTimeFormatShort', '', $language); if (IS_PHP_53 && INTL_INSTALLED) { diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 1e60698646..2e464fe5c3 100644 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -3345,12 +3345,12 @@ class UserManager { $category_id = $row['cat_id']; $cat = Category::load($category_id); $displayscore = ScoreDisplay::instance(); - $grade = ''; + $grade = ''; if (isset($cat) && $displayscore->is_custom()) { - $grade = $displayscore->display_score(array($score, $cat[0]->get_weight()), SCORE_DIV_PERCENT_WITH_CUSTOM); - } else { - $grade = $displayscore->display_score(array($score, $cat[0]->get_weight())); - } + $grade = $displayscore->display_score(array($score, $cat[0]->get_weight()), SCORE_DIV_PERCENT_WITH_CUSTOM); + } else { + $grade = $displayscore->display_score(array($score, $cat[0]->get_weight())); + } $row['grade'] = $grade; return $row; } diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index 4a1fcdf0b6..bdb49df006 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -1004,13 +1004,13 @@ $YouMustAcceptLicence = "You must accept the licence"; $SelectOne = "Select one"; $ContactInformationHasBeenSent = "Contact information has been sent"; $UserInactivedSinceX = "User inactive since %s"; -$ContactInformationDescription = "Dear user,
-
You are about to start using one of the best open-source e-learning platform on the market. Like many other open-source project, this project is backed up by a large community of students, teachers, developers and content creators who would like to promote the project better.
-
-By knowing a little bit more about you, one of our most important users, who will manage this e-learning system, we will be able to let people know that our software is used and let you know when we organize events that might be relevant to you.
-
-By filling this form, you accept that the Chamilo association or its members might send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flow, with a permanent respect of your time and your privacy.
-
+$ContactInformationDescription = "Dear user,
+
You are about to start using one of the best open-source e-learning platform on the market. Like many other open-source project, this project is backed up by a large community of students, teachers, developers and content creators who would like to promote the project better.
+
+By knowing a little bit more about you, one of our most important users, who will manage this e-learning system, we will be able to let people know that our software is used and let you know when we organize events that might be relevant to you.
+
+By filling this form, you accept that the Chamilo association or its members might send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flow, with a permanent respect of your time and your privacy.
+
Please note that you are not required to fill this form. If you want to remain anonymous, we will loose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click \"Next\".

"; $CompanyActivity = "Your company's activity"; $DateUnLock = "Unlock date"; @@ -1216,7 +1216,7 @@ $SaveForNow = "Save and continue later"; $NoQuicktime = "Your browser does not have the QuickTime plugin installed. You can still use the platform, but to run a larger number of media file types, we suggest you might want to install it."; $NoJavaSun = "Your browser doesn't seem to have the Sun Java plugin installed. You can still use the platform, but you will lose a few of its capabilities."; $NoJava = "Your browser does not support Java"; -$JavaSun24 = "Your browser has a Java version not supported by this tool. +$JavaSun24 = "Your browser has a Java version not supported by this tool. To use it you have to install a Java Sun version higher than 24"; $NoMessageAnywere = "If you do not want to see this message again during this session, click here"; $Attempts = "Attempts"; @@ -1380,4 +1380,5 @@ $DataTableSearch = "Search"; $HideColumn = "Hide column"; $DisplayColumn = "Show column"; $LegalAgreementAccepted = "Legal agreement accepted"; +$dateFormatLongNoDay = "%d %B %Y"; ?> \ No newline at end of file