From 04d59319055e9c1910a600d6b2b0e9155896b6fd Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 28 Oct 2019 13:04:22 +0100 Subject: [PATCH] Update get_lang calls using full string. --- main/coursecopy/copy_course.php | 28 ++-- main/coursecopy/copy_course_session.php | 50 +++---- .../copy_course_session_selected.php | 30 ++-- main/coursecopy/create_backup.php | 16 +-- main/coursecopy/import_backup.php | 54 ++++---- main/coursecopy/import_moodle.php | 12 +- main/coursecopy/recycle_course.php | 18 +-- main/create_course/add_course.php | 52 +++---- main/document/add_link.php | 34 ++--- main/document/create_audio.php | 18 +-- main/document/create_document.php | 36 ++--- main/document/create_draw.php | 6 +- main/document/create_paint.php | 10 +- main/document/document.php | 130 +++++++++--------- main/document/document_quota.php | 10 +- main/document/download.php | 2 +- main/document/download_scorm.php | 4 +- main/document/edit_document.php | 62 ++++----- main/document/edit_draw.php | 10 +- main/document/edit_odf.php | 2 +- main/document/edit_paint.php | 8 +- main/document/exit_pixlr.php | 2 +- main/document/record_audio.php | 6 +- main/document/recycle.php | 6 +- main/document/save_pixlr.php | 6 +- main/document/showinframes.php | 6 +- main/document/slideshow.php | 26 ++-- main/document/slideshowoptions.php | 16 +-- main/document/upload.php | 32 ++--- main/document/webcam_clip.php | 8 +- main/document/webcam_receiver.php | 2 +- main/inc/introductionSection.inc.php | 30 ++-- .../lib/formvalidator/Element/SelectAjax.php | 2 +- .../lib/formvalidator/FormValidator.class.php | 78 +++++------ main/inc/lib/javascript/chat/video.php | 4 +- .../svgedit/extensions/imagelib/groups.php | 6 +- .../svgedit/extensions/imagelib/index.php | 4 +- .../svgedit/extensions/imagelib/users.php | 6 +- .../svgedit/extensions/savefile_config.php | 6 +- .../pear/HTML/QuickForm/advanced_settings.php | 2 +- main/inc/lib/pear/HTML/QuickForm/file.php | 2 +- .../svg-edit/extensions/imagelib/groups.php | 6 +- .../svg-edit/extensions/imagelib/index.php | 4 +- .../svg-edit/extensions/imagelib/users.php | 6 +- .../svg-edit/extensions/savefile_config.php | 8 +- main/inc/lib/webservices/Rest.php | 14 +- main/inc/lib/zombie/zombie_report.class.php | 28 ++-- main/lp/blank.php | 10 +- main/lp/content_makers.inc.php | 2 +- main/lp/download.php | 2 +- main/messages/inbox.php | 6 +- main/messages/new_message.php | 54 ++++---- main/messages/outbox.php | 4 +- main/messages/record_audio.php | 2 +- main/messages/view_message.php | 4 +- main/portfolio/add_category.php | 4 +- main/portfolio/add_item.php | 4 +- main/portfolio/edit_category.php | 4 +- main/portfolio/edit_item.php | 4 +- main/portfolio/index.php | 8 +- main/portfolio/list.php | 2 +- main/ticket/assign_tickets.php | 8 +- main/ticket/categories.php | 12 +- main/ticket/categories_add_user.php | 4 +- main/ticket/new_ticket.php | 30 ++-- main/ticket/priorities.php | 10 +- main/ticket/projects.php | 10 +- main/ticket/settings.php | 2 +- main/ticket/status.php | 10 +- main/ticket/ticket_assign_log.php | 5 +- main/ticket/ticket_details.php | 45 +++--- main/ticket/tickets.php | 44 +++--- main/ticket/tutor_report.lib.php | 2 +- main/upload/form.document.php | 2 +- main/upload/form.scorm.php | 18 +-- main/upload/upload.document.php | 26 ++-- main/upload/upload_ppt.php | 29 ++-- main/upload/upload_word.php | 28 ++-- main/webservices/cm_webservice.php | 10 +- .../cm_webservice_announcements.php | 4 +- main/webservices/cm_webservice_courses.php | 4 +- main/webservices/cm_webservice_forum.php | 16 +-- main/webservices/cm_webservice_inbox.php | 10 +- main/webservices/cm_webservice_user.php | 14 +- main/webservices/registration.soap.php | 8 +- 85 files changed, 679 insertions(+), 690 deletions(-) diff --git a/main/coursecopy/copy_course.php b/main/coursecopy/copy_course.php index c0cabadce3..ae80ef5986 100755 --- a/main/coursecopy/copy_course.php +++ b/main/coursecopy/copy_course.php @@ -25,15 +25,15 @@ api_set_more_memory_and_time_limits(); // Breadcrumbs $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'course_info/maintenance.php?'.api_get_cidreq(), - 'name' => get_lang('Maintenance'), + 'name' => get_lang('Backup'), ]; // The section (for the tabs) $this_section = SECTION_COURSES; // Display the header -Display::display_header(get_lang('CopyCourse')); -echo Display::page_header(get_lang('CopyCourse')); +Display::display_header(get_lang('Copy course')); +echo Display::page_header(get_lang('Copy course')); $action = isset($_POST['action']) ? $_POST['action'] : ''; @@ -55,7 +55,7 @@ if (Security::check_token('post') && ( $cr->set_file_option($_POST['same_file_name_option']); $cr->restore($_POST['destination_course']); echo Display::return_message( - get_lang('CopyFinished').': '. + get_lang('Copying is finished').': '. Security::remove_XSS($_POST['destination_course']). '', 'normal', @@ -92,7 +92,7 @@ if (Security::check_token('post') && ( ); if (empty($courseList)) { - echo Display::return_message(get_lang('NoDestinationCoursesAvailable'), 'normal'); + echo Display::return_message(get_lang('No destination course available'), 'normal'); } else { $options = []; foreach ($courseList as $courseItem) { @@ -105,38 +105,38 @@ if (Security::check_token('post') && ( 'post', api_get_path(WEB_CODE_PATH).'coursecopy/copy_course.php?'.api_get_cidreq() ); - $form->addElement('select', 'destination_course', get_lang('SelectDestinationCourse'), $options); + $form->addElement('select', 'destination_course', get_lang('Select target course'), $options); $group = []; - $group[] = $form->createElement('radio', 'copy_option', null, get_lang('FullCopy'), 'full_copy'); - $group[] = $form->createElement('radio', 'copy_option', null, get_lang('LetMeSelectItems'), 'select_items'); - $form->addGroup($group, '', get_lang('SelectOptionForBackup')); + $group[] = $form->createElement('radio', 'copy_option', null, get_lang('Full copy'), 'full_copy'); + $group[] = $form->createElement('radio', 'copy_option', null, get_lang('Let me select learning objects'), 'select_items'); + $form->addGroup($group, '', get_lang('Please select a backup option')); $group = []; $group[] = $form->createElement( 'radio', 'same_file_name_option', null, - get_lang('SameFilenameSkip'), + get_lang('Skip same file name'), FILE_SKIP ); $group[] = $form->createElement( 'radio', 'same_file_name_option', null, - get_lang('SameFilenameRename'), + get_lang('Rename file (eg file.pdf becomes file_1.pdf)'), FILE_RENAME ); $group[] = $form->createElement( 'radio', 'same_file_name_option', null, - get_lang('SameFilenameOverwrite'), + get_lang('Overwrite file'), FILE_OVERWRITE ); - $form->addGroup($group, '', get_lang('SameFilename')); + $form->addGroup($group, '', get_lang('What should be done with imported files with the same file name as existing files?')); $form->addProgress(); - $form->addButtonSave(get_lang('CopyCourse')); + $form->addButtonSave(get_lang('Copy course')); $form->setDefaults(['copy_option' => 'select_items', 'same_file_name_option' => FILE_OVERWRITE]); // Add Security token diff --git a/main/coursecopy/copy_course_session.php b/main/coursecopy/copy_course_session.php index 53ef8cfa2c..412d6ab214 100755 --- a/main/coursecopy/copy_course_session.php +++ b/main/coursecopy/copy_course_session.php @@ -32,10 +32,10 @@ if (!api_is_allowed_to_edit() && !api_is_session_admin()) { $action = isset($_POST['action']) ? $_POST['action'] : ''; $this_section = SECTION_PLATFORM_ADMIN; -$nameTools = get_lang('CopyCourse'); +$nameTools = get_lang('Copy course'); $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'admin/index.php', - 'name' => get_lang('PlatformAdmin'), + 'name' => get_lang('Administration'), ]; // Database Table Definitions @@ -63,9 +63,9 @@ function make_select_session_list($name, $sessions, $attr = []) $output = ''; - $html .= ''; + $html .= ''; $html .= '
'; $html .= ''; $html .= '
'; $options = '
'; + $options .= get_lang('Full copy').''; $options .= '
'; + $options .= ' '.get_lang('Let me select learning objects').''; - $options .= '
'; + $options .= '
'; - $html .= Display::panel($options, get_lang('TypeOfCopy')); + $html .= Display::panel($options, get_lang('Type of copy')); $html .= '
'; - $html .= ''; + $html .= ''; // Add Security token $html .= ''; @@ -182,7 +182,7 @@ function search_courses($id_session, $type) if (!empty($id_session)) { $sessions = SessionManager::get_sessions_list([], ['name', 'ASC']); $select_destination .= ''; - $select_destination .= ''; + $select_destination .= ''; $select_destination .= ''; $xajax_response->addAssign('ajax_sessions_list_destination', 'innerHTML', api_utf8_encode($select_destination)); } @@ -304,10 +304,10 @@ if (Security::check_token('post') && ( $cr = new CourseRestorer($course); //$cr->set_file_option($_POST['same_file_name_option']); $cr->restore($destination_course, $destination_session); - echo Display::return_message(get_lang('CopyFinished'), 'confirmation'); + echo Display::return_message(get_lang('Copying is finished'), 'confirmation'); display_form(); } else { - echo Display::return_message(get_lang('PleaseSelectACourse'), 'confirm'); + echo Display::return_message(get_lang('Please select a course'), 'confirm'); display_form(); } } else { @@ -332,7 +332,7 @@ if (Security::check_token('post') && ( if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) { //We need only one value if (count($arr_course_origin) > 1 || count($arr_course_destination) > 1) { - echo Display::return_message(get_lang('YouMustSelectACourseFromOriginalSession'), 'error'); + echo Display::return_message(get_lang('You must select a course from original session'), 'error'); } else { //first element of the array $course_code = $arr_course_origin[0]; @@ -345,15 +345,15 @@ if (Security::check_token('post') && ( $cr = new CourseRestorer($course); $cr->restore($course_destinatination, $destination_session); - echo Display::return_message(get_lang('CopyFinished'), 'confirm'); + echo Display::return_message(get_lang('Copying is finished'), 'confirm'); display_form(); } else { - echo Display::return_message(get_lang('PleaseSelectACourse'), 'confirm'); + echo Display::return_message(get_lang('Please select a course'), 'confirm'); display_form(); } } } else { - echo Display::return_message(get_lang('YouMustSelectACourseFromOriginalSession'), 'error'); + echo Display::return_message(get_lang('You must select a course from original session'), 'error'); display_form(); } } @@ -367,7 +367,7 @@ if (Security::check_token('post') && ( // Else, if a CourseSelectForm is requested, show it if (api_get_setting('show_glossary_in_documents') != 'none') { - echo Display::return_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'), 'normal'); + echo Display::return_message(get_lang('To export a document that has glossary terms with its references to the glossary, you have to make sure you include the glossary tool in the export'), 'normal'); } $arr_course_origin = []; @@ -389,7 +389,7 @@ if (Security::check_token('post') && ( } if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) { - echo Display::return_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'), 'normal'); + echo Display::return_message(get_lang('If you want to export a course containing a test, you have to make sure the corresponding tests are included in the export, so you have to select them in the list of tests.'), 'normal'); $course_origin = api_get_course_info($arr_course_origin[0]); $cb = new CourseBuilder('', $course_origin); $course = $cb->build($origin_session, $arr_course_origin[0], $with_base_content); @@ -403,7 +403,7 @@ if (Security::check_token('post') && ( echo '
'. Display::return_icon( 'back.png', - get_lang('Back').' '.get_lang('To').' '.get_lang('PlatformAdmin'), + get_lang('Back').' '.get_lang('To').' '.get_lang('Administration'), ['style' => 'vertical-align:middle'] ). get_lang('Back').'
'; diff --git a/main/coursecopy/copy_course_session_selected.php b/main/coursecopy/copy_course_session_selected.php index 1e67b08e25..a56cb9f07f 100644 --- a/main/coursecopy/copy_course_session_selected.php +++ b/main/coursecopy/copy_course_session_selected.php @@ -45,11 +45,11 @@ if (empty($courseCode) || empty($sessionId)) { } $this_section = SECTION_COURSES; -$nameTools = get_lang('CopyCourse'); +$nameTools = get_lang('Copy course'); $returnLink = api_get_path(WEB_CODE_PATH).'course_info/maintenance_coach.php?'.api_get_cidreq(); $interbreadcrumb[] = [ 'url' => $returnLink, - 'name' => get_lang('Maintenance'), + 'name' => get_lang('Backup'), ]; // Database Table Definitions @@ -118,14 +118,14 @@ function displayForm() // Link back to the documents overview $html .= ''.Display::return_icon( 'back.png', - get_lang('BackTo').' '.get_lang('Maintenance'), + get_lang('Back to').' '.get_lang('Backup'), '', ICON_SIZE_MEDIUM ).''; $html .= '
'; $html .= Display::return_message( - get_lang('CopyCourseFromSessionToSessionExplanation') + get_lang('Copy courseFromSessionToSessionExplanation') ); $html .= '
'; @@ -176,17 +176,17 @@ function displayForm() $html .= ''; $html .= "
"; - $html .= ''.get_lang('TypeOfCopy').' ('.get_lang('CopyOnlySessionItems').')'; + $html .= ''.get_lang('Type of copy').' ('.get_lang('Copy only session items').')'; $html .= ''; + $html .= get_lang('Full copy').''; $html .= '
'; + $html .= ' '.get_lang('Let me select learning objects').'
'; $html .= "
"; $html .= ''; + api_htmlentities(get_lang('Please confirm your choice'), ENT_QUOTES) + )."'".')) return false;">'.get_lang('Copy course').''; $html .= '
'; echo $html; } @@ -298,7 +298,7 @@ if (($action === 'course_select_form') || $cr = new CourseRestorer($course); $cr->restore($destinationCourse, $destinationSession); - echo Display::return_message(get_lang('CopyFinished'), 'confirmation'); + echo Display::return_message(get_lang('Copying is finished'), 'confirmation'); displayForm(); } else { @@ -325,7 +325,7 @@ if (($action === 'course_select_form') || //We need only one value if (count($arrCourseOrigin) > 1 || count($arrCourseDestination) > 1) { echo Display::return_message( - get_lang('YouMustSelectACourseFromOriginalSession'), + get_lang('You must select a course from original session'), 'error' ); } else { @@ -338,13 +338,13 @@ if (($action === 'course_select_form') || ); $cr = new CourseRestorer($course); $cr->restore($courseDestination, $destinationSession); - echo Display::return_message(get_lang('CopyFinished'), 'confirmation'); + echo Display::return_message(get_lang('Copying is finished'), 'confirmation'); } displayForm(); } else { echo Display::return_message( - get_lang('YouMustSelectACourseFromOriginalSession'), + get_lang('You must select a course from original session'), 'error' ); displayForm(); @@ -354,7 +354,7 @@ if (($action === 'course_select_form') || // Else, if a CourseSelectForm is requested, show it if (api_get_setting('show_glossary_in_documents') != 'none') { echo Display::return_message( - get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'), + get_lang('To export a document that has glossary terms with its references to the glossary, you have to make sure you include the glossary tool in the export'), 'normal' ); } @@ -371,7 +371,7 @@ if (($action === 'course_select_form') || if (!empty($destinationSession)) { echo Display::return_message( - get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'), + get_lang('If you want to export a course containing a test, you have to make sure the corresponding tests are included in the export, so you have to select them in the list of tests.'), 'normal' ); diff --git a/main/coursecopy/create_backup.php b/main/coursecopy/create_backup.php index 5775574a13..71e4cd10c8 100755 --- a/main/coursecopy/create_backup.php +++ b/main/coursecopy/create_backup.php @@ -31,11 +31,11 @@ $this_section = SECTION_COURSES; // Breadcrumbs $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'course_info/maintenance.php', - 'name' => get_lang('Maintenance'), + 'name' => get_lang('Backup'), ]; // Displaying the header -$nameTools = get_lang('CreateBackup'); +$nameTools = get_lang('Create a backup'); Display::display_header($nameTools); // Display the tool title @@ -58,7 +58,7 @@ if (Security::check_token('post') && $course = $cb->build(); } $zipFile = CourseArchiver::createBackup($course); - echo Display::return_message(get_lang('BackupCreated'), 'confirm'); + echo Display::return_message(get_lang('The backup has been created. The download of this file will start in a few moments. If your download does not start, click the following link'), 'confirm'); echo '
'; echo Display::url( get_lang('Download'), @@ -75,7 +75,7 @@ if (Security::check_token('post') && $hiddenFields['sec_token'] = Security::get_token(); CourseSelectForm::display_form($course, $hiddenFields, false, true); } else { - echo Display::return_message(get_lang('NoResourcesToBackup'), 'warning'); + echo Display::return_message(get_lang('There are no resources to backup'), 'warning'); } } else { $form = new FormValidator( @@ -83,10 +83,10 @@ if (Security::check_token('post') && 'post', api_get_self().'?'.api_get_cidreq() ); - $form->addElement('header', get_lang('SelectOptionForBackup')); - $form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup'); - $form->addElement('radio', 'backup_option', '', get_lang('LetMeSelectItems'), 'select_items'); - $form->addButtonSave(get_lang('CreateBackup')); + $form->addElement('header', get_lang('Please select a backup option')); + $form->addElement('radio', 'backup_option', '', get_lang('Create a complete backup of this course'), 'full_backup'); + $form->addElement('radio', 'backup_option', '', get_lang('Let me select learning objects'), 'select_items'); + $form->addButtonSave(get_lang('Create a backup')); $form->addProgress(); // When progress bar appears we have to hide the title "Please select a backup-option". $form->updateAttributes( diff --git a/main/coursecopy/import_backup.php b/main/coursecopy/import_backup.php index fa8a6c62f1..8cc748713b 100755 --- a/main/coursecopy/import_backup.php +++ b/main/coursecopy/import_backup.php @@ -32,11 +32,11 @@ $this_section = SECTION_COURSES; // Breadcrumbs $interbreadcrumb[] = [ 'url' => '../course_info/maintenance.php', - 'name' => get_lang('Maintenance'), + 'name' => get_lang('Backup'), ]; // Displaying the header -$nameTools = get_lang('ImportBackup'); +$nameTools = get_lang('Import backup'); Display::display_header($nameTools); // Display the tool title @@ -85,23 +85,23 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor $cr = new CourseRestorer($course); $cr->set_file_option($_POST['same_file_name_option']); $cr->restore(); - echo Display::return_message(get_lang('ImportFinished')); + echo Display::return_message(get_lang('Import finished')); echo ''. - get_lang('CourseHomepage').''; + get_lang('Course home').''; } else { if (!$error) { - echo Display::return_message(get_lang('NoResourcesInBackupFile'), 'warning'); - echo ''.get_lang('TryAgain').''; + echo Display::return_message(get_lang('There are no resources in backup file'), 'warning'); + echo ''.get_lang('Try again').''; } elseif ($filename === false) { - echo Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'), 'error'); - echo ''.get_lang('TryAgain').''; + echo Display::return_message(get_lang('The app/cache/ directory, used by this tool, is not writeable. Please contact your platform administrator.'), 'error'); + echo ''.get_lang('Try again').''; } else { if ($filename == '') { - echo Display::return_message(get_lang('SelectBackupFile'), 'error'); - echo ''.get_lang('TryAgain').''; + echo Display::return_message(get_lang('Select a backup file'), 'error'); + echo ''.get_lang('Try again').''; } else { - echo Display::return_message(get_lang('UploadError'), 'error'); - echo ''.get_lang('TryAgain').''; + echo Display::return_message(get_lang('Upload failed, please check maximum file size limits and folder rights.'), 'error'); + echo ''.get_lang('Try again').''; } } } @@ -126,11 +126,11 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor $hiddenFields['sec_token'] = Security::get_token(); CourseSelectForm::display_form($course, $hiddenFields); } elseif ($filename === false) { - echo Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'), 'error'); - echo ''.get_lang('TryAgain').''; + echo Display::return_message(get_lang('The app/cache/ directory, used by this tool, is not writeable. Please contact your platform administrator.'), 'error'); + echo ''.get_lang('Try again').''; } else { - echo Display::return_message(get_lang('NoResourcesInBackupFile'), 'warning'); - echo ''.get_lang('TryAgain').''; + echo Display::return_message(get_lang('There are no resources in backup file'), 'warning'); + echo ''.get_lang('Try again').''; } } else { $user = api_get_user_info(); @@ -144,7 +144,7 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor '', ['enctype' => 'multipart/form-data'] ); - $form->addElement('header', get_lang('SelectBackupFile')); + $form->addElement('header', get_lang('Select a backup file')); $renderer = $form->defaultRenderer(); $renderer->setCustomElementTemplate('
{element}
'); @@ -154,7 +154,7 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', 'backup_type', '', - get_lang('LocalFile'), + get_lang('local file'), 'local', 'id="bt_local" class="checkbox" onclick="javascript: document.import_backup_form.backup_server.disabled=true;document.import_backup_form.backup.disabled=false;"' ); @@ -166,7 +166,7 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', 'backup_type', '', - get_lang('ServerFile'), + get_lang('server file'), 'server', 'id="bt_server" class="checkbox" onclick="javascript: document.import_backup_form.backup_server.disabled=false;document.import_backup_form.backup.disabled=true;"' ); @@ -190,7 +190,7 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', '', '', - ''.get_lang('NoBackupsAvailable').'', + ''.get_lang('No backup is available').'', '', 'disabled="true"' ); @@ -202,7 +202,7 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', 'import_option', '', - get_lang('ImportFullBackup'), + get_lang('Import full backup'), 'full_backup', 'id="import_option_1" class="checkbox"' ); @@ -210,20 +210,20 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', 'import_option', '', - get_lang('LetMeSelectItems'), + get_lang('Let me select learning objects'), 'select_items', 'id="import_option_2" class="checkbox"' ); $form->addElement('html', '

'); - $form->addElement('html', get_lang('SameFilename')); + $form->addElement('html', get_lang('What should be done with imported files with the same file name as existing files?')); $form->addElement('html', '

'); $form->addElement( 'radio', 'same_file_name_option', '', - get_lang('SameFilenameSkip'), + get_lang('What should be done with imported files with the same file name as existing files?Skip'), FILE_SKIP, 'id="same_file_name_option_1" class="checkbox"' ); @@ -231,7 +231,7 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', 'same_file_name_option', '', - get_lang('SameFilenameRename'), + get_lang('What should be done with imported files with the same file name as existing files?Rename'), FILE_RENAME, 'id="same_file_name_option_2" class="checkbox"' ); @@ -239,13 +239,13 @@ if (Security::check_token('post') && ($action === 'course_select_form' || $impor 'radio', 'same_file_name_option', '', - get_lang('SameFilenameOverwrite'), + get_lang('What should be done with imported files with the same file name as existing files?Overwrite'), FILE_OVERWRITE, 'id="same_file_name_option_3" class="checkbox"' ); $form->addElement('html', '
'); - $form->addButtonImport(get_lang('ImportBackup')); + $form->addButtonImport(get_lang('Import backup')); $values['backup_type'] = 'local'; $values['import_option'] = 'full_backup'; $values['same_file_name_option'] = FILE_OVERWRITE; diff --git a/main/coursecopy/import_moodle.php b/main/coursecopy/import_moodle.php index 7d2496abe0..0a992ff1d2 100644 --- a/main/coursecopy/import_moodle.php +++ b/main/coursecopy/import_moodle.php @@ -26,11 +26,11 @@ $this_section = SECTION_COURSES; // Breadcrumbs $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'course_info/maintenance.php?'.api_get_cidreq(), - 'name' => get_lang('Maintenance'), + 'name' => get_lang('Backup'), ]; $form = new FormValidator('import_moodle', 'post', api_get_self().'?'.api_get_cidreq()); -$form->addFile('moodle_file', get_lang('MoodleFile')); +$form->addFile('moodle_file', get_lang('Moodle course file')); $form->addButtonImport(get_lang('Import')); if ($form->validate()) { @@ -43,7 +43,7 @@ if ($form->validate()) { Display::addFlash( Display::return_message( - get_lang('MoodleFileImportedSuccessfully'), + get_lang('Moodle course fileImportedSuccessfully'), 'success' ) ); @@ -54,14 +54,14 @@ if ($form->validate()) { } } -$template = new Template(get_lang('ImportFromMoodle')); -$infoMsg = Display::return_message(get_lang('ImportFromMoodleInstructions'), 'normal', false); +$template = new Template(get_lang('Import from Moodle')); +$infoMsg = Display::return_message(get_lang('Import from MoodleInstructions'), 'normal', false); $template->assign('info_msg', $infoMsg); $template->assign('form', $form->returnForm()); $templateName = $template->get_template('coursecopy/import_moodle.tpl'); $content = $template->fetch($templateName); -$template->assign('header', get_lang('ImportFromMoodle')); +$template->assign('header', get_lang('Import from Moodle')); $template->assign('content', $content); $template->display_one_col_template(); diff --git a/main/coursecopy/recycle_course.php b/main/coursecopy/recycle_course.php index 2be924a98b..44f205b95b 100755 --- a/main/coursecopy/recycle_course.php +++ b/main/coursecopy/recycle_course.php @@ -27,11 +27,11 @@ $this_section = SECTION_COURSES; // Breadcrumbs $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'course_info/maintenance.php', - 'name' => get_lang('Maintenance'), + 'name' => get_lang('Backup'), ]; // Displaying the header -$nameTools = get_lang('RecycleCourse'); +$nameTools = get_lang('Empty this course'); Display::display_header($nameTools); // Display the tool title @@ -62,7 +62,7 @@ if (Security::check_token('post') && ( } $cr = new CourseRecycler($course); $cr->recycle($recycle_type); - echo Display::return_message(get_lang('RecycleFinished'), 'confirm'); + echo Display::return_message(get_lang('Recycle is finished'), 'confirm'); } elseif (Security::check_token('post') && ( isset($_POST['recycle_option']) && $_POST['recycle_option'] === 'select_items' @@ -80,14 +80,14 @@ if (Security::check_token('post') && ( $cb = new CourseBuilder(); $course = $cb->build(); if (!$course->has_resources()) { - echo get_lang('NoResourcesToRecycle'); + echo get_lang('No resource to recycle'); } else { - echo Display::return_message(get_lang('RecycleWarning'), 'warning', false); + echo Display::return_message(get_lang('Warning: using this tool, you will delete learning objects in your course. There is no UNDO possible. We advise you to create a backup before.'), 'warning', false); $form = new FormValidator('recycle_course', 'post', api_get_self().'?'.api_get_cidreq()); - $form->addElement('header', get_lang('SelectOptionForBackup')); - $form->addElement('radio', 'recycle_option', null, get_lang('FullRecycle'), 'full_backup'); - $form->addElement('radio', 'recycle_option', null, get_lang('LetMeSelectItems'), 'select_items'); - $form->addButtonSave(get_lang('RecycleCourse')); + $form->addElement('header', get_lang('Please select a backup option')); + $form->addElement('radio', 'recycle_option', null, get_lang('Delete everything'), 'full_backup'); + $form->addElement('radio', 'recycle_option', null, get_lang('Let me select learning objects'), 'select_items'); + $form->addButtonSave(get_lang('Empty this course')); $form->setDefaults(['recycle_option' => 'select_items']); // Add Security token $token = Security::get_token(); diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php index e253bfdb74..3a67c288f3 100755 --- a/main/create_course/add_course.php +++ b/main/create_course/add_course.php @@ -59,11 +59,11 @@ $htmlHeadXtra[] = ' '; $link_terms_and_conditions .= Display::url( - get_lang('ReadTermsAndConditions'), + get_lang('Read the Terms and Conditions'), '#', ['onclick' => "javascript:MM_openBrWindow('$terms_and_conditions_url', 'Conditions', 'scrollbars=yes, width=800');"] ); @@ -273,8 +273,8 @@ if (api_get_setting('teacher_can_select_course_template') === 'true') { 'select_ajax', 'course_template', [ - get_lang('CourseTemplate'), - get_lang('PickACourseAsATemplateForThisNewCourse'), + get_lang('Course template'), + get_lang('Pick a course as template for this new course'), ], null, ['url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_course'] @@ -284,7 +284,7 @@ if (api_get_setting('teacher_can_select_course_template') === 'true') { $form->addElement('html', '
'); // Submit button. -$form->addButtonCreate($course_validation_feature ? get_lang('CreateThisCourseRequest') : get_lang('CreateCourseArea')); +$form->addButtonCreate($course_validation_feature ? get_lang('Create this course request') : get_lang('Create this course')); // The progress bar of this form. $form->addProgress(); @@ -388,7 +388,7 @@ if ($form->validate()) { } } else { $message = Display::return_message( - get_lang('CourseCreationFailed'), + get_lang('The course has not been created due to an internal error.'), 'error', false ); @@ -411,7 +411,7 @@ if ($form->validate()) { if ($request_id) { $course_request_info = CourseRequestManager::get_course_request_info($request_id); - $message = (is_array($course_request_info) ? ''.$course_request_info['code'].' : ' : '').get_lang('CourseRequestCreated'); + $message = (is_array($course_request_info) ? ''.$course_request_info['code'].' : ' : '').get_lang('Your request for a new course has been sent successfully. You may receive a reply soon, within one or two days.'); $message = Display::return_message( $message, 'confirmation', @@ -420,7 +420,7 @@ if ($form->validate()) { $message .= Display::tag( 'div', Display::url( - get_lang('Enter'), + get_lang('Back to courses list'), api_get_path(WEB_PATH).'user_portal.php', ['class' => 'btn btn-primary'] ), @@ -428,7 +428,7 @@ if ($form->validate()) { ); } else { $message = Display::return_message( - get_lang('CourseRequestCreationFailed'), + get_lang('The course request has not been created due to an internal error.'), 'error', false ); @@ -438,7 +438,7 @@ if ($form->validate()) { } } else { $message = Display::return_message( - get_lang('CourseCodeAlreadyExists'), + get_lang('CourseCourse codeAlreadyExists'), 'error', false ); @@ -447,7 +447,7 @@ if ($form->validate()) { } } else { if (!$course_validation_feature) { - $message = Display::return_message(get_lang('Explanation')); + $message = Display::return_message(get_lang('Once you click on "Create a course", a course is created with a section for Tests, Project based learning, Assessments, Courses, Dropbox, Agenda and much more. Logging in as teacher provides you with editing privileges for this course.')); } // Display the form. $formContent = $form->returnForm(); diff --git a/main/document/add_link.php b/main/document/add_link.php index d3e9358fa9..9f2d7e71d3 100644 --- a/main/document/add_link.php +++ b/main/document/add_link.php @@ -53,7 +53,7 @@ if (api_get_group_id()) { $groupIid = $group_properties['iid']; $interbreadcrumb[] = [ 'url' => '../group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace'), + 'name' => get_lang('Group area'), ]; } else { api_not_allowed(true); @@ -95,7 +95,7 @@ if (empty($document_data['parents'])) { $this_section = SECTION_COURSES; -$nameTools = get_lang('LinkAdd'); +$nameTools = get_lang('Add a link'); $action = api_get_self().'?'.api_get_cidreq().'&id='.$document_id; // URLs in whitelist @@ -109,8 +109,8 @@ $urlWLHTML = ""; $form = new FormValidator('upload', 'POST', $action, '', ['enctype' => 'multipart/form-data']); $form->addHidden('linkid', $document_id); $form->addHidden('curdirpath', $path); -$form->addElement('text', 'name', get_lang('LinkName'), ['id' => 'name_link']); -$form->addElement('text', 'url', get_lang('Url'), ['id' => 'url_link']); +$form->addElement('text', 'name', get_lang('Link name'), ['id' => 'name_link']); +$form->addElement('text', 'url', get_lang('URL'), ['id' => 'url_link']); $form->addElement( 'static', 'info', @@ -119,29 +119,29 @@ $form->addElement( 'ValidDomainList' ).' ' ); -$form->addButtonSend(get_lang('AddCloudLink'), 'submitDocument'); +$form->addButtonSend(get_lang('Add link to Cloud file'), 'submitDocument'); -$form->addRule('name', get_lang('PleaseEnterCloudLinkName'), 'required', null, 'client'); -$form->addRule('name', get_lang('PleaseEnterCloudLinkName'), 'required', null, 'server'); -$form->addRule('url', get_lang('PleaseEnterURL'), 'required', null, 'client'); -$form->addRule('url', get_lang('PleaseEnterURL'), 'required', null, 'server'); +$form->addRule('name', get_lang('PleaseEnterCloudLink name'), 'required', null, 'client'); +$form->addRule('name', get_lang('PleaseEnterCloudLink name'), 'required', null, 'server'); +$form->addRule('url', get_lang('Please enter the URL'), 'required', null, 'client'); +$form->addRule('url', get_lang('Please enter the URL'), 'required', null, 'server'); // Well formed url pattern (must have the protocol) $urlRegEx = DocumentManager::getWellFormedUrlRegex(); -$form->addRule('url', get_lang('NotValidURL'), 'regex', $urlRegEx, 'client'); -$form->addRule('url', get_lang('NotValidURL'), 'regex', $urlRegEx, 'server'); -$form->addRule('url', get_lang('NotValidDomain').$urlWLText, 'regex', $urlWLRegEx, 'client'); -$form->addRule('url', get_lang('NotValidDomain').$urlWLHTML, 'regex', $urlWLRegEx, 'server'); +$form->addRule('url', get_lang('URL field format invalid. Example of expected format: http://dropbox.com/sh/loremipsum/loremipsum?dl=0'), 'regex', $urlRegEx, 'client'); +$form->addRule('url', get_lang('URL field format invalid. Example of expected format: http://dropbox.com/sh/loremipsum/loremipsum?dl=0'), 'regex', $urlRegEx, 'server'); +$form->addRule('url', get_lang('The domain is not valid. It must be one of the following:').$urlWLText, 'regex', $urlWLRegEx, 'client'); +$form->addRule('url', get_lang('The domain is not valid. It must be one of the following:').$urlWLHTML, 'regex', $urlWLRegEx, 'server'); if ($form->validate()) { if (isset($_REQUEST['linkid'])) { $doc_id = DocumentManager::addCloudLink($courseInfo, $path, $_REQUEST['url'], $_REQUEST['name']); if ($doc_id) { - Display::addFlash(Display::return_message(get_lang('CloudLinkAdded'), 'success', false)); + Display::addFlash(Display::return_message(get_lang('CloudAdd a linked'), 'success', false)); } else { if (DocumentManager::cloudLinkExists($courseInfo, $path, $_REQUEST['url'])) { - Display::addFlash(Display::return_message(get_lang('UrlAlreadyExists'), 'warning', false)); + Display::addFlash(Display::return_message(get_lang('URLAlreadyExists'), 'warning', false)); } else { - Display::addFlash(Display::return_message(get_lang('ErrorAddCloudLink'), 'warning', false)); + Display::addFlash(Display::return_message(get_lang('ErrorAdd link to Cloud file'), 'warning', false)); } } header('Location: document.php?'.api_get_cidreq()); @@ -156,7 +156,7 @@ Display::display_header($nameTools, 'Doc'); echo '
'; // Link back to the documents overview echo ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM). + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM). ''; echo '
'; diff --git a/main/document/create_audio.php b/main/document/create_audio.php index f1b1e0800a..abbfd09a90 100755 --- a/main/document/create_audio.php +++ b/main/document/create_audio.php @@ -16,7 +16,7 @@ use ChamiloSession as Session; require_once __DIR__.'/../inc/global.inc.php'; $this_section = SECTION_COURSES; -$nameTools = get_lang('CreateAudio'); +$nameTools = get_lang('Create audio'); api_protect_course_script(); api_block_anonymous_users(); @@ -87,7 +87,7 @@ if (!is_dir($filepath)) { if (!empty($groupId)) { $interbreadcrumb[] = [ "url" => "../group/group_space.php?".api_get_cidreq(), - "name" => get_lang('GroupSpace'), + "name" => get_lang('Group area'), ]; $group = GroupManager:: get_group_properties($groupId); $path = explode('/', $dir); @@ -150,14 +150,14 @@ echo '
'; echo ''; echo Display::return_icon( 'back.png', - get_lang('BackTo').' '.get_lang('DocumentsOverview'), + get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM ); echo ''; echo ''. - Display::return_icon('google.png', get_lang('GoogleAudio'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('google.png', get_lang('Use Google audio services'), '', ICON_SIZE_MEDIUM).''; echo '
'; ?> @@ -225,13 +225,13 @@ while ($row = Database::fetch_array($result_select)) { if ($service == 'google') { $selected_language = api_get_language_isocode(); //lang default is the course language $form = new FormValidator('form1', 'post', api_get_self().'?'.api_get_cidreq(), '', ['id' => 'form1']); - $form->addHeader(get_lang('HelpText2Audio')); + $form->addHeader(get_lang('Convert your text to speech')); $form->addElement('hidden', 'text2voice_mode', 'google'); $form->addElement('hidden', 'id', $document_id); $form->addElement('text', 'title', get_lang('Title')); $form->addElement('select', 'lang', get_lang('Language'), $options); - $form->addElement('textarea', 'text', get_lang('InsertText2Audio'), ['id' => 'textarea_google']); - $form->addButtonSave(get_lang('SaveMP3')); + $form->addElement('textarea', 'text', get_lang('Enter the text you want to convert to an audio file'), ['id' => 'textarea_google']); + $form->addButtonSave(get_lang('Save mp3')); $defaults = []; $defaults['lang'] = $selected_language; $form->setDefaults($defaults); @@ -301,7 +301,7 @@ function downloadAudioGoogle($dir) } if (empty($content)) { - Display::addFlash(Display::return_message(get_lang('GoogleTranslateApiReturnedEmptyAnswer'), 'error')); + Display::addFlash(Display::return_message(get_lang('The Google Translate API used by this feature returned and empty answer. Please check or ask your translate_app_google_key setting is set correctly, or kindly ask an administrator to do so.'), 'error')); return; } @@ -323,6 +323,6 @@ function downloadAudioGoogle($dir) true, $content ); - echo Display::return_message(get_lang('DocumentCreated'), 'confirm'); + echo Display::return_message(get_lang('Documented created'), 'confirm'); echo ''; } diff --git a/main/document/create_document.php b/main/document/create_document.php index 547b5a87cb..5952e9e5ff 100755 --- a/main/document/create_document.php +++ b/main/document/create_document.php @@ -63,9 +63,9 @@ if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') { $is_certificate_mode = true; } -$nameTools = get_lang('CreateDocument'); +$nameTools = get_lang('Create a rich media page / activity'); if ($is_certificate_mode) { - $nameTools = get_lang('CreateCertificate'); + $nameTools = get_lang('Create certificate'); } /* Constants and variables */ @@ -200,7 +200,7 @@ if (!$is_certificate_mode) { if (api_is_in_group()) { $interbreadcrumb[] = [ "url" => "../group/group_space.php?".api_get_cidreq(), - "name" => get_lang('GroupSpace'), + "name" => get_lang('Group area'), ]; $path = explode('/', $dir); if ('/'.$path[1] != $group_properties['directory']) { @@ -214,7 +214,7 @@ if (!$is_certificate_mode) { } else { $interbreadcrumb[] = [ 'url' => Category::getUrl(), - 'name' => get_lang('Gradebook'), + 'name' => get_lang('Assessments'), ]; } @@ -297,7 +297,7 @@ function document_exists($filename) if ($is_certificate_mode) { $form->addText( 'title', - get_lang('CertificateName'), + get_lang('Certificate name'), true, ['cols-size' => [2, 10, 0], 'autofocus'] ); @@ -316,11 +316,11 @@ if (!empty($groupId)) { 'checkbox', 'readonly', '', - get_lang('ReadOnly') + get_lang('Read only') ); } -$form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists'); +$form->addRule('title', get_lang('Required field'), 'required'); +$form->addRule('title', get_lang('The operation is impossible, a file with this name already exists.'), 'callback', 'document_exists'); $current_session_id = api_get_session_id(); $form->addHtmlEditor( @@ -352,7 +352,7 @@ if (!$is_certificate_mode && $parent_select = $form->addSelect( 'curdirpath', - get_lang('DestinationDirectory'), + get_lang('Destination folder'), null, ['cols-size' => [2, 10, 0]] ); @@ -397,7 +397,7 @@ if (!$is_certificate_mode && } if (empty($group_dir)) { - $parent_select->addOption(get_lang('HomeDirectory'), '/'); + $parent_select->addOption(get_lang('Home'), '/'); if (is_array($folders)) { foreach ($folders as &$folder) { //Hide some folders @@ -451,7 +451,7 @@ if (!$is_certificate_mode && $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : ''; $label = $folder_titles[$folder]; if ($folder == $group_dir) { - $label = '/ ('.get_lang('HomeDirectory').')'; + $label = '/ ('.get_lang('Home').')'; } else { $path_parts = explode('/', str_replace($group_dir, '', $folder)); $label = cut($label, 80); @@ -469,9 +469,9 @@ if (!$is_certificate_mode && $form->addHidden('dirValue', ''); if ($is_certificate_mode) { - $form->addButtonCreate(get_lang('CreateCertificate')); + $form->addButtonCreate(get_lang('Create certificate')); } else { - $form->addButtonCreate(get_lang('CreateDoc')); + $form->addButtonCreate(get_lang('Create a rich media page / activity')); } $form->setDefaults($defaults); @@ -542,11 +542,11 @@ if ($form->validate()) { } $certificate_condition = '&certificate=true&curdirpath=/certificates'; } - Display::addFlash(Display::return_message(get_lang('ItemAdded'))); + Display::addFlash(Display::return_message(get_lang('Item added'))); header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$certificate_condition); exit(); } else { - Display::addFlash(Display::return_message(get_lang('Impossible'), 'error')); + Display::addFlash(Display::return_message(get_lang('Operation impossible'), 'error')); header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id); exit(); } @@ -577,12 +577,12 @@ if ($form->validate()) { // link back to the documents overview if ($is_certificate_mode) { $actionsLeft = ''. - Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('Certificate overview'), '', ICON_SIZE_MEDIUM).''; $actionsLeft .= ''. Display::return_icon('expand.png', get_lang('Back'), ['id' => 'expand'], ICON_SIZE_MEDIUM).Display::return_icon('contract.png', get_lang('Back'), ['id' => 'contract', 'class' => 'hide'], ICON_SIZE_MEDIUM).''; } else { $actionsLeft = ''. - Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; $actionsLeft .= ''. Display::return_icon('expand.png', get_lang('Expand'), ['id' => 'expand'], ICON_SIZE_MEDIUM). Display::return_icon('contract.png', get_lang('Collapse'), ['id' => 'contract', 'class' => 'hide'], ICON_SIZE_MEDIUM).''; @@ -600,7 +600,7 @@ if ($form->validate()) { foreach ($all_information_by_create_certificate[0] as $info_value) { $str_info .= $info_value.'
'; } - $create_certificate = get_lang('CreateCertificateWithTags'); + $create_certificate = get_lang('Create certificateWithTags'); echo Display::return_message($create_certificate.':

'.$str_info, 'normal', false); } diff --git a/main/document/create_draw.php b/main/document/create_draw.php index 817aae2fe6..30c39cf390 100755 --- a/main/document/create_draw.php +++ b/main/document/create_draw.php @@ -82,7 +82,7 @@ $groupId = api_get_group_id(); if (!empty($groupId)) { $interbreadcrumb[] = [ "url" => "../group/group_space.php?".api_get_cidreq(), - "name" => get_lang('GroupSpace'), + "name" => get_lang('Group area'), ]; $group = GroupManager :: get_group_properties($groupId); $path = explode('/', $dir); @@ -139,7 +139,7 @@ Display :: display_header($nameTools, 'Doc'); echo '
'; echo ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; echo '
'; if (api_browser_support('svg')) { @@ -167,7 +167,7 @@ if (api_browser_support('svg')) { echo ''; echo ''; } else { - echo Display::return_message(get_lang('BrowserDontSupportsSVG'), 'error'); + echo Display::return_message(get_lang('Your browser does not support SVG files. To use the drawing tool you must have an advanced browser such as Firefox or Chrome'), 'error'); } Display :: display_footer(); diff --git a/main/document/create_paint.php b/main/document/create_paint.php index 040d1900a3..7ed25120f9 100755 --- a/main/document/create_paint.php +++ b/main/document/create_paint.php @@ -21,7 +21,7 @@ if (api_get_setting('enabled_support_paint') === 'false') { } $this_section = SECTION_COURSES; -$nameTools = get_lang('PhotoRetouching'); +$nameTools = get_lang('Photo retouching'); $groupRights = Session::read('group_member_with_upload_rights'); api_protect_course_script(); @@ -47,7 +47,7 @@ if (empty($paintDir)) { } Session::write('paint_dir', $paintDir); -Session::write('paint_file', get_lang('NewImage')); +Session::write('paint_file', get_lang('New image')); // Please, do not modify this dirname formatting if (strstr($dir, '..')) { @@ -78,7 +78,7 @@ $groupId = api_get_group_id(); if (!empty($groupId)) { $interbreadcrumb[] = [ "url" => api_get_path(WEB_CODE_PATH)."group/group_space.php?".api_get_cidreq(), - "name" => get_lang('GroupSpace'), + "name" => get_lang('Group area'), ]; $group = GroupManager::get_group_properties($groupId); $path = explode('/', $dir); @@ -129,7 +129,7 @@ echo '
'; echo ''. Display::return_icon( 'back.png', - get_lang('BackTo').' '.get_lang('DocumentsOverview'), + get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM ). @@ -138,7 +138,7 @@ echo '
'; // pixlr // max size 1 Mb ?? -$title = urlencode(utf8_encode(get_lang('NewImage'))); //TODO:check +$title = urlencode(utf8_encode(get_lang('New image'))); //TODO:check $image = Display::returnIconPath('canvas1024x768.png'); $exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; Session::write('exit_pixlr', $document_data['path']); diff --git a/main/document/document.php b/main/document/document.php index 2fd582c4f5..073500c44b 100755 --- a/main/document/document.php +++ b/main/document/document.php @@ -47,7 +47,7 @@ $charset = 'utf-8'; if ($allowDownloadDocumentsByApiKey) { try { if ($action !== 'download') { - throw new Exception(get_lang('SelectAnAction')); + throw new Exception(get_lang('Select an action')); } $username = isset($_GET['username']) ? Security::remove_XSS($_GET['username']) : null; @@ -186,7 +186,7 @@ if (!empty($groupId)) { ]; $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace').' '.$group_properties['name'], + 'name' => get_lang('Group area').' '.$group_properties['name'], ]; //they are allowed to upload $groupMemberWithUploadRights = true; @@ -201,7 +201,7 @@ if (!empty($groupId)) { ]; $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace').' '.$group_properties['name'], + 'name' => get_lang('Group area').' '.$group_properties['name'], ]; // Allowed to upload? @@ -223,7 +223,7 @@ if (!empty($groupId)) { Session::write('group_member_with_upload_rights', false); } -// Actions. +// Detail. $document_id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : null; $currentUrl = api_get_self().'?'.api_get_cidreq().'&id='.$document_id; $curdirpath = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : null; @@ -289,30 +289,30 @@ switch ($action) { ); Display::addFlash( Display::return_message( - get_lang('DocDeleted').': '.$documentInfo['title'], + get_lang('Document deleted').': '.$documentInfo['title'], 'success' ) ); } else { - Display::addFlash(Display::return_message(get_lang('DocDeleteError'), 'warning')); + Display::addFlash(Display::return_message(get_lang('Error during the delete of document'), 'warning')); } } else { // Cloud Links $deleteDocument = DocumentManager::deleteCloudLink($courseInfo, $_GET['deleteid']); if ($deleteDocument) { Display::addFlash(Display::return_message( - get_lang('CloudLinkDeleted').': '.$documentInfo['title'], + get_lang('Cloud link deleted').': '.$documentInfo['title'], 'success' )); } else { Display::addFlash(Display::return_message( - get_lang('CloudLinkDeleteError').': '.$documentInfo['title'], + get_lang('Error deleting the cloud link.').': '.$documentInfo['title'], 'error' )); } } } else { - Display::addFlash(Display::return_message(get_lang('FileNotFound'), 'warning')); + Display::addFlash(Display::return_message(get_lang('The file was not found'), 'warning')); } header("Location: $currentUrl"); exit; @@ -475,7 +475,7 @@ switch ($action) { $parent_id = 0; } $file_link = Display::url( - get_lang('SeeFile'), + get_lang('See file'), api_get_path(WEB_CODE_PATH).'social/myfiles.php?' .api_get_cidreq_params($cidReq, $id_session, $gidReq). '&parent_id='.$parent_id @@ -486,7 +486,7 @@ switch ($action) { } if (file_exists($copyfile)) { - $message = get_lang('CopyAlreadyDone').'

'; + $message = get_lang('There are a file with the same name in your private user file area. Do you want replace it?').'

'; $message .= '' @@ -504,10 +504,10 @@ switch ($action) { } if (isset($_GET['copy']) && $_GET['copy'] === 'yes') { if (!copy($file, $copyfile)) { - Display::addFlash(Display::return_message(get_lang('CopyFailed'), 'error')); + Display::addFlash(Display::return_message(get_lang('Copy failed'), 'error')); } else { Display::addFlash(Display::return_message( - get_lang('OverwritenFile').' '.$file_link, + get_lang('File replaced').' '.$file_link, 'confirmation', false )); @@ -515,10 +515,10 @@ switch ($action) { } } else { if (!copy($file, $copyfile)) { - Display::addFlash(Display::return_message(get_lang('CopyFailed'), 'error')); + Display::addFlash(Display::return_message(get_lang('Copy failed'), 'error')); } else { Display::addFlash( - Display::return_message(get_lang('CopyMade').' '.$file_link, 'confirmation', false) + Display::return_message(get_lang('The copy has been made').' '.$file_link, 'confirmation', false) ); } } @@ -543,7 +543,7 @@ switch ($action) { $fileInfo = pathinfo($file); if ($fileInfo['extension'] == $formatTarget) { Display::addFlash(Display::return_message( - get_lang('ConversionToSameFileFormat'), + get_lang('Conversion to same file format. Please choose another.'), 'warning' )); } elseif ( @@ -551,7 +551,7 @@ switch ($action) { !(in_array($formatTarget, DocumentManager::getJodconverterExtensionList('to', $formatType))) ) { Display::addFlash(Display::return_message( - get_lang('FileFormatNotSupported'), + get_lang('File format not supported'), 'warning' )); } else { @@ -562,7 +562,7 @@ switch ($action) { $obj = new OpenofficePresentation(true); if (file_exists($convertedFile)) { Display::addFlash(Display::return_message( - get_lang('FileExists'), + get_lang('The operation is impossible, a file with this name already exists.'), 'error' )); } else { @@ -573,7 +573,7 @@ switch ($action) { ); if (empty($result)) { Display::addFlash(Display::return_message( - get_lang('CopyFailed'), + get_lang('Copy failed'), 'error' )); } else { @@ -581,14 +581,14 @@ switch ($action) { $id_session = api_get_session_id(); $gidReq = Security::remove_XSS($_GET['gidReq']); $file_link = Display::url( - get_lang('SeeFile'), + get_lang('See file'), api_get_path(WEB_CODE_PATH) .'document/showinframes.php?' .api_get_cidreq_params($cidReq, $id_session, $gidReq) .'&id='.current($result) ); Display::addFlash(Display::return_message( - get_lang('CopyMade').' '.$file_link, + get_lang('The copy has been made').' '.$file_link, 'confirmation', false )); @@ -787,7 +787,7 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates' && $htmlHeadXtra[] = '"; $tpl = new Template($tool_name); -$content = Display::page_subheader(get_lang('ShowCourseQuotaUse')).'

'; +$content = Display::page_subheader(get_lang('Space Available')).'
'; $tpl->assign('content', $content); $tpl->display_one_col_template(); diff --git a/main/document/download.php b/main/document/download.php index eb757c3768..ad863a1a37 100755 --- a/main/document/download.php +++ b/main/document/download.php @@ -108,7 +108,7 @@ if (Security::check_abs_path($sys_course_path.$doc_url, $sys_course_path.'/')) { } if (!api_is_allowed_to_edit() && !$is_visible) { - echo Display::return_message(get_lang('ProtectedDocument'), 'error'); //api_not_allowed backbutton won't work. + echo Display::return_message(get_lang('Protected Document'), 'error'); //api_not_allowed backbutton won't work. exit; // You shouldn't be here anyway. } // Launch event diff --git a/main/document/download_scorm.php b/main/document/download_scorm.php index 51b76a49ad..11812d0447 100755 --- a/main/document/download_scorm.php +++ b/main/document/download_scorm.php @@ -58,8 +58,8 @@ if (Security::check_abs_path($sys_course_path.$doc_url, $sys_course_path.'/')) { $fixLinks = api_get_configuration_value('lp_replace_http_to_https'); $result = DocumentManager::file_send_for_download($full_file_name, false, '', $fixLinks); if ($result === false) { - api_not_allowed(true, get_lang('FileNotFound'), 404); + api_not_allowed(true, get_lang('The file was not found'), 404); } } else { - api_not_allowed(true, get_lang('FileNotFound'), 404); + api_not_allowed(true, get_lang('The file was not found'), 404); } diff --git a/main/document/edit_document.php b/main/document/edit_document.php index 1e61ffb516..1535da1ccb 100755 --- a/main/document/edit_document.php +++ b/main/document/edit_document.php @@ -154,7 +154,7 @@ $course_id = api_get_course_int_id(); if (!empty($group_id)) { $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace'), + 'name' => get_lang('Group area'), ]; $group_document = true; } @@ -167,7 +167,7 @@ if (!$is_certificate_mode) { } else { $interbreadcrumb[] = [ 'url' => Category::getUrl(), - 'name' => get_lang('Gradebook'), + 'name' => get_lang('Assessments'), ]; } @@ -217,7 +217,7 @@ if (!empty($sessionId)) { if (api_is_in_group()) { $group_properties = GroupManager::get_group_properties($group_id); - GroupManager::allowUploadEditDocument( + GroupManager::allowUploadEdit( api_get_user_id(), api_get_course_int_id(), $group_properties, @@ -257,12 +257,12 @@ if (isset($_POST['comment'])) { $em->flush(); if ($file_type != 'link') { - Display::addFlash(Display::return_message(get_lang('Updated'))); + Display::addFlash(Display::return_message(get_lang('Update successful'))); } else { - Display::addFlash(Display::return_message(get_lang('CloudLinkModified'))); + Display::addFlash(Display::return_message(get_lang('Cloud file link updated.'))); } } else { - Display::addFlash(Display::return_message(get_lang('UrlAlreadyExists'), 'warning')); + Display::addFlash(Display::return_message(get_lang('This URL already exists'), 'warning')); } } } @@ -310,7 +310,7 @@ if (in_array($extension, ['html', 'htm'])) { } // Display the header -$nameTools = get_lang('EditDocument').': '.Security::remove_XSS($document_data['title']); +$nameTools = get_lang('Edit').': '.Security::remove_XSS($document_data['title']); Display::display_header($nameTools, 'Doc'); $owner_id = $node->getCreator()->getId(); @@ -368,12 +368,12 @@ if ($owner_id == api_get_user_id() || } if (!empty($createdDate)) { - $form->addLabel(get_lang('CreatedOn'), Display::dateToStringAgoAndLongDate($createdDate)); + $form->addLabel(get_lang('Created on'), Display::dateToStringAgoAndLongDate($createdDate)); } if ($file_type != 'link') { if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { - $form->addLabel(get_lang('UpdatedOn'), Display::dateToStringAgoAndLongDate($last_edit_date)); + $form->addLabel(get_lang('Update successfulOn'), Display::dateToStringAgoAndLongDate($last_edit_date)); } if (!empty($document_info['insert_user_id'])) { @@ -392,7 +392,7 @@ if ($owner_id == api_get_user_id() || $urlWLRegEx = '/(\/\/|\.)('.implode('|', $urlWL).')/i'; $urlWLText = "\n\t* ".implode("\n\t* ", $urlWL); $urlWLHTML = ""; - $form->addText('comment', get_lang('Url')); + $form->addText('comment', get_lang('URL')); $form->addElement( 'static', 'info', @@ -407,7 +407,7 @@ if ($owner_id == api_get_user_id() || if ($file_type != 'link') { if ($owner_id == api_get_user_id() || api_is_platform_admin()) { - $checked = &$form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); + $checked = &$form->addElement('checkbox', 'readonly', null, get_lang('Read only')); if ($readonly == 1) { $checked->setChecked(true); } @@ -415,22 +415,22 @@ if ($owner_id == api_get_user_id() || } if ($file_type == 'link') { - $form->addRule('title', get_lang('PleaseEnterCloudLinkName'), 'required'); - $form->addRule('comment', get_lang('PleaseEnterURL'), 'required'); + $form->addRule('title', get_lang('Please enter a name for this Cloud link'), 'required'); + $form->addRule('comment', get_lang('Please enter the URL'), 'required'); // Well formed url pattern (must have the protocol) $urlRegEx = DocumentManager::getWellFormedUrlRegex(); - $form->addRule('comment', get_lang('NotValidURL'), 'regex', $urlRegEx, 'client'); - $form->addRule('comment', get_lang('NotValidURL'), 'regex', $urlRegEx, 'server'); - $form->addRule('comment', get_lang('NotValidDomain').$urlWLText, 'regex', $urlWLRegEx, 'client'); - $form->addRule('comment', get_lang('NotValidDomain').$urlWLHTML, 'regex', $urlWLRegEx, 'server'); + $form->addRule('comment', get_lang('URL field format invalid. Example of expected format: http://dropbox.com/sh/loremipsum/loremipsum?dl=0'), 'regex', $urlRegEx, 'client'); + $form->addRule('comment', get_lang('URL field format invalid. Example of expected format: http://dropbox.com/sh/loremipsum/loremipsum?dl=0'), 'regex', $urlRegEx, 'server'); + $form->addRule('comment', get_lang('The domain is not valid. It must be one of the following:').$urlWLText, 'regex', $urlWLRegEx, 'client'); + $form->addRule('comment', get_lang('The domain is not valid. It must be one of the following:').$urlWLHTML, 'regex', $urlWLRegEx, 'server'); } if ($is_certificate_mode) { - $form->addButtonUpdate(get_lang('SaveCertificate')); + $form->addButtonUpdate(get_lang('Save certificate')); } elseif ($file_type == 'link') { - $form->addButtonUpdate(get_lang('SaveLink')); + $form->addButtonUpdate(get_lang('Save link')); } else { - $form->addButtonUpdate(get_lang('SaveDocument')); + $form->addButtonUpdate(get_lang('Save document')); } $form->addHidden('formSent', 1); $form->addHidden('filename', $filename); @@ -462,7 +462,7 @@ if ($owner_id == api_get_user_id() || foreach ($all_information_by_create_certificate[0] as $info_value) { $str_info .= $info_value.'
'; } - $create_certificate = get_lang('CreateCertificateWithTags'); + $create_certificate = get_lang('Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:'); echo Display::return_message( $create_certificate.':

'.$str_info, 'normal', @@ -473,7 +473,7 @@ if ($owner_id == api_get_user_id() || if ($extension == 'svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true' ) { - echo Display::return_message(get_lang('BrowserDontSupportsSVG'), 'warning'); + echo Display::return_message(get_lang('Your browser does not support SVG files. To use the drawing tool you must have an advanced browser such as Firefox or Chrome'), 'warning'); } if ($file_type != 'link') { // HTML-editor @@ -521,27 +521,27 @@ function show_return($document_id, $path, $call_from_tool = '', $slide_id = 0, $ if ($is_certificate_mode) { $selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : ''); $actionsLeft .= ''. - Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('Certificate overview'), '', ICON_SIZE_MEDIUM).''; $actionsLeft .= ''.Display::return_icon('expand.png', get_lang('Expand'), ['id' => 'expand'], ICON_SIZE_MEDIUM).Display::return_icon('contract.png', get_lang('Collapse'), ['id' => 'contract', 'class' => 'hide'], ICON_SIZE_MEDIUM).''; } elseif ($call_from_tool == 'slideshow') { $actionsLeft .= ''. - Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('slideshow.png', get_lang('Back to').' '.get_lang('View Slideshow'), '', ICON_SIZE_MEDIUM).''; } elseif ($call_from_tool == 'editdraw') { $actionsLeft .= ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; - $actionsLeft .= ''.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), [], 32).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; + $actionsLeft .= ''.Display::return_icon('draw.png', get_lang('Back to').' '.get_lang('Draw'), [], 32).''; } elseif ($call_from_tool == 'editodf') { $actionsLeft .= ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; - $actionsLeft .= ''.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), [], 32).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; + $actionsLeft .= ''.Display::return_icon('draw.png', get_lang('Back to').' '.get_lang('Write'), [], 32).''; $actionsLeft .= ''.Display::return_icon('expand.png', get_lang('Expand'), ['id' => 'expand'], ICON_SIZE_MEDIUM).Display::return_icon('contract.png', get_lang('Collapse'), ['id' => 'contract', 'class' => 'hide'], ICON_SIZE_MEDIUM).''; } elseif ($call_from_tool == 'editpaint' && api_get_setting('enabled_support_pixlr') === 'true') { $actionsLeft .= ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), [], ICON_SIZE_MEDIUM).''; - $actionsLeft .= ''.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), [], 32).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), [], ICON_SIZE_MEDIUM).''; + $actionsLeft .= ''.Display::return_icon('paint.png', get_lang('Back to').' '.get_lang('Paint'), [], 32).''; } else { $actionsLeft .= ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; $actionsLeft .= ''.Display::return_icon('expand.png', get_lang('Expand'), ['id' => 'expand'], ICON_SIZE_MEDIUM).Display::return_icon('contract.png', get_lang('Collapse'), ['id' => 'contract', 'class' => 'hide'], ICON_SIZE_MEDIUM).''; } diff --git a/main/document/edit_draw.php b/main/document/edit_draw.php index e89273bc04..7d9f682b9a 100755 --- a/main/document/edit_draw.php +++ b/main/document/edit_draw.php @@ -53,7 +53,7 @@ $get_file = Security::remove_XSS($file_path); $file = basename($get_file); $temp_file = explode(".", $file); $filename = $temp_file[0]; -$nameTools = get_lang('EditDocument').': '.$filename; +$nameTools = get_lang('Edit').': '.$filename; $courseDir = $_course['path'].'/document'; $is_allowed_to_edit = api_is_allowed_to_edit(null, true); @@ -88,7 +88,7 @@ if (!is_dir($filepath)) { if (!empty($group_id)) { $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace'), + 'name' => get_lang('Group area'), ]; $group_document = true; } @@ -103,7 +103,7 @@ if (!$is_certificate_mode) { } else { $interbreadcrumb[] = [ 'url' => Category::getUrl(), - 'name' => get_lang('Gradebook'), + 'name' => get_lang('Assessments'), ]; } @@ -133,7 +133,7 @@ Event::event_access_tool(TOOL_DOCUMENT); Display :: display_header($nameTools, 'Doc'); echo '
'; echo ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; echo ''. Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).''; echo '
'; @@ -167,6 +167,6 @@ if (api_browser_support('svg')) { echo ''; echo ''; } else { - echo Display::return_message(get_lang('BrowserDontSupportsSVG'), 'error'); + echo Display::return_message(get_lang('Your browser does not support SVG files. To use the drawing tool you must have an advanced browser such as Firefox or Chrome'), 'error'); } Display::display_footer(); diff --git a/main/document/edit_odf.php b/main/document/edit_odf.php index 2f8c045863..75fe56e84b 100755 --- a/main/document/edit_odf.php +++ b/main/document/edit_odf.php @@ -115,7 +115,7 @@ if (!empty($documentInfo['parents'])) { $actionBack = Display::url( Display::return_icon( 'back.png', - get_lang('BackTo').' '.get_lang('DocumentsOverview'), + get_lang('Back to').' '.get_lang('Documents overview'), [], ICON_SIZE_MEDIUM ), diff --git a/main/document/edit_paint.php b/main/document/edit_paint.php index c03e0c4a95..cf1a4b7997 100755 --- a/main/document/edit_paint.php +++ b/main/document/edit_paint.php @@ -54,7 +54,7 @@ $get_file = Security::remove_XSS($file_path); $file = basename($get_file); $temp_file = explode(".", $file); $filename = $temp_file[0]; -$nameTools = get_lang('EditDocument').': '.$filename; +$nameTools = get_lang('Edit').': '.$filename; $courseDir = $_course['path'].'/document'; $is_allowed_to_edit = api_is_allowed_to_edit(null, true); /* Other initialization code */ @@ -85,7 +85,7 @@ if (!is_dir($filepath)) { if (!empty($groupId)) { $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace'), + 'name' => get_lang('Group area'), ]; $group_document = true; } @@ -100,7 +100,7 @@ if (!$is_certificate_mode) { } else { $interbreadcrumb[] = [ 'url' => Category::getUrl(), - 'name' => get_lang('Gradebook'), + 'name' => get_lang('Assessments'), ]; } @@ -128,7 +128,7 @@ Event::event_access_tool(TOOL_DOCUMENT); Display :: display_header($nameTools, 'Doc'); echo '
'; echo ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; echo ''. Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).''; echo '
'; diff --git a/main/document/exit_pixlr.php b/main/document/exit_pixlr.php index 3c1334a5f3..ff6f7a1dab 100755 --- a/main/document/exit_pixlr.php +++ b/main/document/exit_pixlr.php @@ -33,7 +33,7 @@ if (empty($exit)) { echo ''; api_not_allowed(true); } else { - echo '
'.get_lang('PleaseStandBy').'
'; + echo '
'.get_lang('Please stand by...').'
'; $location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($exit).'&'.api_get_cidreq(); echo ''; Session::erase('exit_pixlr'); diff --git a/main/document/record_audio.php b/main/document/record_audio.php index 92e295ee88..2c645512cf 100755 --- a/main/document/record_audio.php +++ b/main/document/record_audio.php @@ -11,7 +11,7 @@ use ChamiloSession as Session; require_once __DIR__.'/../inc/global.inc.php'; $this_section = SECTION_COURSES; $groupRights = Session::read('group_member_with_upload_rights'); -$nameTools = get_lang('VoiceRecord'); +$nameTools = get_lang('Voice record'); api_protect_course_script(); api_block_anonymous_users(); @@ -76,7 +76,7 @@ if (!is_dir($filepath)) { //groups //TODO: clean if (!empty($groupId)) { - $interbreadcrumb[] = ["url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')]; + $interbreadcrumb[] = ["url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('Group area')]; $group = GroupManager :: get_group_properties($groupId); $path = explode('/', $dir); if ('/'.$path[1] != $group['directory']) { @@ -141,7 +141,7 @@ $htmlHeadXtra[] = ''; exit; } else { - echo '
'.get_lang('PleaseStandBy').'
'; + echo '
'.get_lang('Please stand by...').'
'; $location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($exit).'&'.api_get_cidreq(); echo ''; Session::erase('exit_pixlr'); diff --git a/main/document/showinframes.php b/main/document/showinframes.php index d53ae552ec..d9c9a1f49b 100755 --- a/main/document/showinframes.php +++ b/main/document/showinframes.php @@ -112,7 +112,7 @@ if (isset($group_id) && $group_id != '') { ]; $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace').' '.$current_group_name, + 'name' => get_lang('Group area').' '.$current_group_name, ]; $name_to_show = explode('/', $name_to_show); unset($name_to_show[1]); @@ -297,7 +297,7 @@ if ($execute_iframe) { $actionsLeft .= Display::url( Display::return_icon( 'edit.png', - get_lang('Modify'), + get_lang('Edit'), '', ICON_SIZE_MEDIUM ), @@ -325,7 +325,7 @@ if ($execute_iframe) { ] ); $actionsLeft .= Display::url( - Display::return_icon('pdf.png', get_lang('Export2PDF'), [], ICON_SIZE_MEDIUM), + Display::return_icon('pdf.png', get_lang('Export to PDF format'), [], ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq( ).'&action=export_to_pdf&id='.$document_id ); diff --git a/main/document/slideshow.php b/main/document/slideshow.php index e93f2d31f9..a30f9f020d 100755 --- a/main/document/slideshow.php +++ b/main/document/slideshow.php @@ -39,7 +39,7 @@ $url = 'document.php?curdirpath='.$pathurl.'&'.api_get_cidreq(); $originaltoolname = get_lang('Documents'); $_course = api_get_course_info(); $interbreadcrumb[] = ['url' => Security::remove_XSS($url), 'name' => $originaltoolname]; -$originaltoolname = get_lang('SlideShow'); +$originaltoolname = get_lang('Slideshow'); $sessionId = api_get_session_id(); $groupIid = 0; @@ -93,7 +93,7 @@ if ($slide_id != 'all') { } else { $imgp = 'action_prev.png'; $first = ' - '.Display::return_icon('action_first.png', get_lang('FirstSlide')).' + '.Display::return_icon('action_first.png', get_lang('First slide')).' '; } @@ -120,11 +120,11 @@ if ($slide_id != 'all') { } if ($slide == $total_slides - 1) { $imgn = 'action_next_na.png'; - $last = Display::return_icon('action_last_na.png', get_lang('LastSlide')); + $last = Display::return_icon('action_last_na.png', get_lang('Last slide')); } else { $imgn = 'action_next.png'; $last = ' - '.Display::return_icon('action_last.png', get_lang('LastSlide')).' + '.Display::return_icon('action_last.png', get_lang('Last slide')).' '; } echo Display::return_icon($imgn, get_lang('Next')); @@ -146,13 +146,13 @@ echo Display::url( // Show thumbnails if ($slide_id != 'all') { echo ''. - Display::return_icon('thumbnails.png', get_lang('ShowThumbnails'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('thumbnails.png', get_lang('Show Thumbnails'), '', ICON_SIZE_MEDIUM).''; } else { - echo Display::return_icon('thumbnails_na.png', get_lang('ShowThumbnails'), '', ICON_SIZE_MEDIUM); + echo Display::return_icon('thumbnails_na.png', get_lang('Show Thumbnails'), '', ICON_SIZE_MEDIUM); } // Slideshow options echo ''. - Display::return_icon('settings.png', get_lang('SetSlideshowOptions'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('settings.png', get_lang('Gallery settings'), '', ICON_SIZE_MEDIUM).''; echo ''; echo '
'; @@ -490,15 +490,15 @@ if ($slide_id != 'all' && !empty($image_files_only)) { $aux = explode('.', htmlspecialchars($image_files_only[$slide])); $ext = $aux[count($aux) - 1]; if ($imageResize == 'resizing') { - $resize_info = get_lang('Resizing').'
'; + $resize_info = get_lang('RESIZE').'
'; $resize_width = Session::read('image_resizing_width').' x '; $resize_height = Session::read('image_resizing_height'); } elseif ($imageResize != 'noresizing') { - $resize_info = get_lang('Resizing').'
'; + $resize_info = get_lang('RESIZE').'
'; $resize_width = get_lang('Auto').' x '; $resize_height = get_lang('Auto'); } else { - $resize_info = get_lang('NoResizing').'
'; + $resize_info = get_lang('NoRESIZE').'
'; $resize_width = ''; $resize_height = ''; } @@ -506,7 +506,7 @@ if ($slide_id != 'all' && !empty($image_files_only)) { echo '
  • '; echo $image_files_only[$slide].' '; echo Display::toolbarButton( - get_lang('Modify'), + get_lang('Edit'), 'edit_document.php?'.api_get_cidreq().'&'.http_build_query([ 'id' => $row['id'], 'origin' => 'slideshow', @@ -527,11 +527,11 @@ if ($slide_id != 'all' && !empty($image_files_only)) { echo ''; } } else { - echo Display::return_message(get_lang('FileNotFound'), 'warning'); + echo Display::return_message(get_lang('The file was not found'), 'warning'); } } else { if ($slide_id != 'all') { - echo Display::return_message(get_lang('NoDataAvailable'), 'warning'); + echo Display::return_message(get_lang('No data available'), 'warning'); } } diff --git a/main/document/slideshowoptions.php b/main/document/slideshowoptions.php index b8c5eb1517..4acf27559c 100755 --- a/main/document/slideshowoptions.php +++ b/main/document/slideshowoptions.php @@ -36,13 +36,13 @@ $originaltoolname = get_lang('Documents'); $interbreadcrumb[] = ['url' => $url, 'name' => $originaltoolname]; $url = 'slideshow.php?curdirpath='.$pathurl; -$originaltoolname = get_lang('SlideShow'); +$originaltoolname = get_lang('Slideshow'); $interbreadcrumb[] = ['url' => $url, 'name' => $originaltoolname]; // Because $nametools uses $_SERVER['PHP_SELF'] for the breadcrumbs instead of $_SERVER['REQUEST_URI'], I had to // bypass the $nametools thing and use tags in the $interbreadcrump array $url = 'slideshowoptions.php?curdirpath='.$pathurl; -$originaltoolname = ''.get_lang('SlideshowOptions').''; +$originaltoolname = ''.get_lang('Slideshow Options').''; $interbreadcrumb[] = ['url' => $url, 'name' => $originaltoolname]; Display::display_header($originaltoolname, 'Doc'); @@ -65,14 +65,14 @@ window.onload = '.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).''; -$actions .= ''.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).''; +$actions = ''.Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM).''; +$actions .= ''.Display::return_icon('slideshow.png', get_lang('Back to').' '.get_lang('Slideshow'), '', ICON_SIZE_MEDIUM).''; echo Display::toolbarAction('toolbar-slideshow', [$actions]); ?>
    - +
    - '.get_lang('NoResizing').', '.get_lang('NoResizingComment'); ?> + '.get_lang('NO RESIZING').', '.get_lang('NO RESIZINGComment'); ?>
    - '.get_lang('ResizingAuto').', '.get_lang('ResizingAutoComment'); ?> + '.get_lang('AUTO RESIZE (default)').', '.get_lang('AUTO RESIZE (default)Comment'); ?>
    - '.get_lang('Resizing').', '.get_lang('ResizingComment'); ?> + '.get_lang('RESIZE').', '.get_lang('RESIZEComment'); ?>
    diff --git a/main/document/upload.php b/main/document/upload.php index f71f064c0d..e439179376 100755 --- a/main/document/upload.php +++ b/main/document/upload.php @@ -83,7 +83,7 @@ if (!empty($groupId)) { if ($is_allowed_to_edit || GroupManager::is_user_in_group(api_get_user_id(), $group_properties)) { $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), - 'name' => get_lang('GroupSpace'), + 'name' => get_lang('Group area'), ]; } else { api_not_allowed(true); @@ -116,10 +116,10 @@ if ($groupId != 0) { $add_group_to_title = ' ('.$group_properties['name'].')'; } if (isset($_REQUEST['certificate'])) { - $nameTools = get_lang('UploadCertificate').$add_group_to_title; + $nameTools = get_lang('Upload certificate').$add_group_to_title; $is_certificate_mode = true; } else { - $nameTools = get_lang('UplUploadDocument').$add_group_to_title; + $nameTools = get_lang('Upload documents').$add_group_to_title; } $certificateLink = ''; @@ -131,7 +131,7 @@ if ($is_certificate_mode) { if ($is_certificate_mode) { $interbreadcrumb[] = [ 'url' => '../gradebook/index.php?'.api_get_cidreq().$certificateLink, - 'name' => get_lang('Gradebook'), + 'name' => get_lang('Assessments'), ]; } else { $interbreadcrumb[] = [ @@ -196,11 +196,11 @@ Display::display_header($nameTools, 'Doc'); // Link back to the documents overview if ($is_certificate_mode) { $actions = ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM). + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Certificate overview'), '', ICON_SIZE_MEDIUM). ''; } else { $actions = ''. - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM). + Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Documents overview'), '', ICON_SIZE_MEDIUM). ''; } @@ -236,8 +236,8 @@ $repo = Container::getDocumentRepository(); $total = $repo->getTotalSpace(api_get_course_int_id()); $courseQuota = format_file_size(DocumentManager::get_course_quota() - $total); $label = - get_lang('MaxFileSize').': '.ini_get('upload_max_filesize').'
    '. - get_lang('DocumentQuota').': '.$courseQuota; + get_lang('Maximum file size').': '.ini_get('upload_max_filesize').'
    '. + get_lang('Space Available').': '.$courseQuota; $form->addElement('file', 'file', [get_lang('File'), $label], 'style="width: 250px" id="user_upload"'); $form->addElement('text', 'title', get_lang('Title'), ['id' => 'title_file']); @@ -252,21 +252,21 @@ $form->addElement( 'checkbox', 'unzip', get_lang('Options'), - get_lang('Uncompress'), + get_lang('Uncompress zip'), 'onclick="javascript: check_unzip();" value="1"' ); if (api_get_setting('search_enabled') === 'true') { //TODO: include language file - $supportedFormats = get_lang('SupportedFormatsForIndex').': HTML, PDF, TXT, PDF, Postscript, MS Word, RTF, MS Power Point'; + $supportedFormats = get_lang('Supported formats for index').': HTML, PDF, TXT, PDF, Postscript, MS Word, RTF, MS Power Point'; $form->addElement( 'checkbox', 'index_document', '', - get_lang('SearchFeatureDoIndexDocument').'
    '.$supportedFormats.'
    ' + get_lang('Index document text?').'
    '.$supportedFormats.'
    ' ); $form->addElement('html', '
    '); - $form->addElement('html', '
    '.get_lang('SearchFeatureDocumentLanguage').'
    '); + $form->addElement('html', '
    '.get_lang('Document language for indexation').'
    '); $form->addLabel(get_lang('Language'), api_get_languages_combo()); $form->addElement('html', '
    '); $specific_fields = get_specific_field_list(); @@ -276,14 +276,14 @@ if (api_get_setting('search_enabled') === 'true') { $form->addElement('html', '
    '); } -$form->addElement('radio', 'if_exists', get_lang('UplWhatIfFileExists'), get_lang('UplDoNothing'), 'nothing'); -$form->addElement('radio', 'if_exists', '', get_lang('UplOverwriteLong'), 'overwrite'); -$form->addElement('radio', 'if_exists', '', get_lang('UplRenameLong'), 'rename'); +$form->addElement('radio', 'if_exists', get_lang('If file exists:'), get_lang('Do nothing'), 'nothing'); +$form->addElement('radio', 'if_exists', '', get_lang('Overwrite the existing file'), 'overwrite'); +$form->addElement('radio', 'if_exists', '', get_lang('Rename the uploaded file if it exists'), 'rename'); // Close the java script and avoid the footer up $form->addElement('html', '
    '); // Button upload document -$form->addButtonSend(get_lang('SendDocument'), 'submitDocument'); +$form->addButtonSend(get_lang('Upload file'), 'submitDocument'); $form->addProgress('DocumentUpload', 'file'); $fileExistsOption = api_get_setting('document_if_file_exists_option'); diff --git a/main/document/webcam_clip.php b/main/document/webcam_clip.php index 118740d6ec..d1e64bafdf 100755 --- a/main/document/webcam_clip.php +++ b/main/document/webcam_clip.php @@ -17,7 +17,7 @@ require_once __DIR__.'/../inc/global.inc.php'; $_SESSION['whereami'] = 'document/webcamclip'; $this_section = SECTION_COURSES; -$nameTools = get_lang('WebCamClip'); +$nameTools = get_lang('Webcam Clip'); $htmlHeadXtra[] = api_get_js_simple(api_get_path(WEB_PATH).'web/assets/webcamjs/webcam.js'); $htmlHeadXtra[] = api_get_js('webcam_recorder.js'); $groupRights = Session::read('group_member_with_upload_rights'); @@ -81,7 +81,7 @@ if (!is_dir($filepath)) { if (!empty($groupId)) { $interbreadcrumb[] = [ "url" => "../group/group_space.php?".api_get_cidreq(), - "name" => get_lang('GroupSpace'), + "name" => get_lang('Group area'), ]; $noPHP_SELF = true; $group = GroupManager::get_group_properties($groupId); @@ -142,7 +142,7 @@ $actions = Display::toolbarAction( Display::url( Display::return_icon( 'back.png', - get_lang('BackTo').' '.get_lang('DocumentsOverview'), + get_lang('Back to').' '.get_lang('Documents overview'), [], ICON_SIZE_MEDIUM ), @@ -159,7 +159,7 @@ $template->assign('filename', 'video_clip.jpg'); $layout = $template->get_template('document/webcam.tpl'); $content = $template->fetch($layout); -$template->assign('header', get_lang('TakeYourPhotos')); +$template->assign('header', get_lang('Take your photos')); $template->assign('actions', $actions); $template->assign('content', $content); $template->display_one_col_template(); diff --git a/main/document/webcam_receiver.php b/main/document/webcam_receiver.php index 6660aaf816..1ec9dbf6bd 100755 --- a/main/document/webcam_receiver.php +++ b/main/document/webcam_receiver.php @@ -84,4 +84,4 @@ $doc_id = DocumentManager::addDocument( $title_to_save ); $url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath; -echo get_lang('ClipSent'); +echo get_lang('Clip sent'); diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php index 7641c2af5c..bc131e4a74 100755 --- a/main/inc/introductionSection.inc.php +++ b/main/inc/introductionSection.inc.php @@ -90,7 +90,7 @@ if ($intro_editAllowed) { $em->persist($toolIntro); $em->flush(); - Display::addFlash(Display::return_message(get_lang('IntroductionTextUpdated'), 'confirmation', false)); + Display::addFlash(Display::return_message(get_lang('Intro was updated'), 'confirmation', false)); } else { // got to the delete command $intro_cmdDel = true; @@ -105,7 +105,7 @@ if ($intro_editAllowed) { $em->remove($toolIntro); $em->flush(); - Display::addFlash(Display::return_message(get_lang('IntroductionTextDeleted'), 'confirmation')); + Display::addFlash(Display::return_message(get_lang('Intro was deleted'), 'confirmation')); } } @@ -184,7 +184,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) { // Show only the current course progress step $last_done_advance = $thematic->get_last_done_thematic_advance(); $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance); - $subTitle1 = get_lang('CurrentTopic'); + $subTitle1 = get_lang('Current topic'); $class1 = ' current'; } elseif ($displayMode == '2') { // Show only the two next course progress steps @@ -192,20 +192,20 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) { $next_advance_not_done = $thematic->get_next_thematic_advance_not_done(2); $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance); $thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done); - $subTitle1 = $subTitle2 = get_lang('NextTopic'); + $subTitle1 = $subTitle2 = get_lang('Next topic'); } elseif ($displayMode == '3') { // Show the current and next course progress steps $last_done_advance = $thematic->get_last_done_thematic_advance(); $next_advance_not_done = $thematic->get_next_thematic_advance_not_done(); $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance); $thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done); - $subTitle1 = get_lang('CurrentTopic'); - $subTitle2 = get_lang('NextTopic'); + $subTitle1 = get_lang('Current topic'); + $subTitle2 = get_lang('Next topic'); $class1 = ' current'; } if (!empty($thematic_advance_info)) { - $thematic_advance = get_lang('CourseThematicAdvance'); + $thematic_advance = get_lang('Course progress'); $thematicScore = $thematic->get_total_average_of_thematic_advances().'%'; $thematicUrl = api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq(); $thematic_info = $thematic->get_thematic_list($thematic_advance_info['thematic_id']); @@ -235,7 +235,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {

    '.Display::returnFontAwesomeIcon('book').strip_tags($thematic_info['title']).'

    '.Display::returnFontAwesomeIcon('calendar-o').$thematic_advance_info['start_date'].'

    '.Display::returnFontAwesomeIcon('file-text-o').strip_tags($thematic_advance_info['content']).'
    -

    '.Display::returnFontAwesomeIcon('clock-o').get_lang('DurationInHours').' : '.$thematic_advance_info['duration'].' - '.get_lang('SeeDetail').'

    +

    '.Display::returnFontAwesomeIcon('clock-o').get_lang('Duration in hours').' : '.$thematic_advance_info['duration'].' - '.get_lang('See detail').'

    '; @@ -251,7 +251,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {

    '.Display::returnFontAwesomeIcon('book').$thematic_info2['title'].'

    '.Display::returnFontAwesomeIcon('calendar-o').$thematic_advance_info2['start_date'].'

    '.Display::returnFontAwesomeIcon('file-text-o').strip_tags($thematic_advance_info2['content']).'
    -

    '.Display::returnFontAwesomeIcon('clock-o').get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].' - '.get_lang('SeeDetail').'

    +

    '.Display::returnFontAwesomeIcon('clock-o').get_lang('Duration in hours').' : '.$thematic_advance_info2['duration'].' - '.get_lang('See detail').'

    '; } @@ -260,7 +260,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) { $thematicPanel .= '
    '.$thematicItemOne.$thematicItemTwo.'
    '; $thematicPanel .= ''; $thematicPanel .= '
    - '.get_lang('ShowFullCourseAdvance').' + '.get_lang('Show course planning').'
    '; $thematicProgress = Display::panelCollapse( @@ -285,7 +285,7 @@ $toolbar = []; /*if (api_is_allowed_to_edit() && empty($session_id)) { $tool = [ - 'name' => get_lang('CustomizeIcons'), + 'name' => get_lang('Customize icons'), 'url' => api_get_path(WEB_CODE_PATH).'course_info/tools.php?'.api_get_cidreq(), 'icon' => 'fas fa-cog', ]; @@ -316,14 +316,14 @@ if ($intro_dispCommand) { if (!empty($courseId)) { $tool = [ - 'name' => get_lang('Modify'), + 'name' => get_lang('Edit'), 'url' => api_get_self().'?'.api_get_cidreq().$blogParam.'&intro_cmdEdit=1', 'icon' => 'fas fa-pencil-alt', ]; $toolbar[] = $tool; $tool = [ - 'name' => addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))), + 'name' => addslashes(api_htmlentities(get_lang('Please confirm your choice'))), 'url' => api_get_self()."?".api_get_cidreq().$blogParam."&intro_cmdDel=1", 'icon' => 'fas fa-trash-alt', 'class' => 'delete-swal', @@ -331,14 +331,14 @@ if ($intro_dispCommand) { $toolbar[] = $tool; } else { $tool = [ - 'name' => get_lang('Modify'), + 'name' => get_lang('Edit'), 'url' => api_get_self().'?intro_cmdEdit=1', 'icon' => 'fas fa-pencil-alt', ]; $toolbar[] = $tool; $tool = [ - 'name' => addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))), + 'name' => addslashes(api_htmlentities(get_lang('Please confirm your choice'))), 'url' => api_get_self()."?".api_get_cidreq()."&intro_cmdDel=1", 'icon' => 'fas fa-trash-alt', 'class' => 'delete-swal', diff --git a/main/inc/lib/formvalidator/Element/SelectAjax.php b/main/inc/lib/formvalidator/Element/SelectAjax.php index 3f286a64b5..862076b511 100644 --- a/main/inc/lib/formvalidator/Element/SelectAjax.php +++ b/main/inc/lib/formvalidator/Element/SelectAjax.php @@ -44,7 +44,7 @@ class SelectAjax extends HTML_QuickForm_select $plHolder = $this->getAttribute('placeholder'); if (empty($plHolder)) { - $plHolder = get_lang('SelectAnOption'); + $plHolder = get_lang('Please select an option'); } $id = $this->getAttribute('id'); diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index d1cdc86002..d13a3e5629 100755 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -87,8 +87,8 @@ class FormValidator extends HTML_QuickForm //When you want to group buttons use something like this /* $group = array(); - $group[] = $form->createElement('button', 'mark_all', get_lang('MarkAll')); - $group[] = $form->createElement('button', 'unmark_all', get_lang('UnmarkAll')); + $group[] = $form->createElement('button', 'mark_all', get_lang('Select all')); + $group[] = $form->createElement('button', 'unmark_all', get_lang('Unselect all')); $form->addGroup($group, 'buttons_in_action'); */ $renderer->setElementTemplate($templateSimple, 'buttons_in_action'); @@ -102,7 +102,7 @@ class FormValidator extends HTML_QuickForm //Set required field template $this->setRequiredNote( - '* '.get_lang('ThisFieldIsRequired').'' + '* '.get_lang('Required field').'' ); $noteTemplate = <<applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } return $element; @@ -229,7 +229,7 @@ EOT; $this->addElement('hidden', $name.'_end'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } } @@ -329,7 +329,7 @@ EOT; $element = $this->addElement('textarea', $name, $label, $attributes); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } return $element; @@ -951,7 +951,7 @@ EOT; @@ -1047,7 +1047,7 @@ EOT; $this->addElement('html_editor', $name, $label, $attributes, $config); $this->applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } /** @var HtmlEditor $element */ @@ -1122,7 +1122,7 @@ EOT; */ public function addButtonAdvancedSettings($name, $label = '') { - $label = !empty($label) ? $label : get_lang('AdvancedParameters'); + $label = !empty($label) ? $label : get_lang('Advanced settings'); return $this->addElement('advanced_settings', $name, $label); } @@ -1133,7 +1133,7 @@ EOT; public function addProgress($delay = 2, $label = '') { if (empty($label)) { - $label = get_lang('PleaseStandBy'); + $label = get_lang('Please stand by...'); } $this->with_progress_bar = true; $id = $this->getAttribute('id'); @@ -1241,10 +1241,10 @@ EOT; { $this->addElement('url', $name, $label, $attributes); $this->applyFilter($name, 'trim'); - $this->addRule($name, get_lang('InsertAValidUrl'), 'url'); + $this->addRule($name, get_lang('Insert a valid URL'), 'url'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } } @@ -1267,7 +1267,7 @@ EOT; $attributes, [ 'pattern' => '[a-zA-ZñÑ]+', - 'title' => get_lang('OnlyLetters'), + 'title' => get_lang('Only letters'), ] ); @@ -1276,7 +1276,7 @@ EOT; $name, [ $label, - get_lang('OnlyLetters'), + get_lang('Only letters'), ], $attributes ); @@ -1284,12 +1284,12 @@ EOT; $this->applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } $this->addRule( $name, - get_lang('OnlyLetters'), + get_lang('Only letters'), 'regex', '/^[a-zA-ZñÑ]+$/' ); @@ -1314,7 +1314,7 @@ EOT; $attributes, [ 'pattern' => '[a-zA-Z0-9ñÑ]+', - 'title' => get_lang('OnlyLettersAndNumbers'), + 'title' => get_lang('Only lettersAndNumbers'), ] ); @@ -1323,7 +1323,7 @@ EOT; $name, [ $label, - get_lang('OnlyLettersAndNumbers'), + get_lang('Only lettersAndNumbers'), ], $attributes ); @@ -1331,12 +1331,12 @@ EOT; $this->applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } $this->addRule( $name, - get_lang('OnlyLettersAndNumbers'), + get_lang('Only lettersAndNumbers'), 'regex', '/^[a-zA-Z0-9ÑÑ]+$/' ); @@ -1370,13 +1370,13 @@ EOT; $this->applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } // Rule allows "," and "." /*$this->addRule( $name, - get_lang('OnlyNumbers'), + get_lang('Only numbers'), 'regex', '/(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)|(^-?\d\d*\,\d*$)|(^-?\,\d\d*$)/' );*/ @@ -1384,7 +1384,7 @@ EOT; if ($allowNegative == false) { $this->addRule( $name, - get_lang('NegativeValue'), + get_lang('Negative value'), 'compare', '>=', 'server', @@ -1397,7 +1397,7 @@ EOT; if (!is_null($minValue)) { $this->addRule( $name, - get_lang('UnderMin'), + get_lang('Under the minimum.'), 'compare', '>=', 'server', @@ -1410,7 +1410,7 @@ EOT; if (!is_null($maxValue)) { $this->addRule( $name, - get_lang('OverMax'), + get_lang('Value exceeds score.'), 'compare', '<=', 'server', @@ -1440,7 +1440,7 @@ EOT; $attributes, [ 'pattern' => '[a-zA-ZñÑ\s]+', - 'title' => get_lang('OnlyLettersAndSpaces'), + 'title' => get_lang('Only lettersAndSpaces'), ] ); @@ -1449,7 +1449,7 @@ EOT; $name, [ $label, - get_lang('OnlyLettersAndSpaces'), + get_lang('Only lettersAndSpaces'), ], $attributes ); @@ -1457,12 +1457,12 @@ EOT; $this->applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } $this->addRule( $name, - get_lang('OnlyLettersAndSpaces'), + get_lang('Only lettersAndSpaces'), 'regex', '/^[a-zA-ZñÑ\s]+$/' ); @@ -1487,7 +1487,7 @@ EOT; $attributes, [ 'pattern' => '[a-zA-Z0-9ñÑ\s]+', - 'title' => get_lang('OnlyLettersAndNumbersAndSpaces'), + 'title' => get_lang('Only lettersAndNumbersAndSpaces'), ] ); @@ -1496,7 +1496,7 @@ EOT; $name, [ $label, - get_lang('OnlyLettersAndNumbersAndSpaces'), + get_lang('Only lettersAndNumbersAndSpaces'), ], $attributes ); @@ -1504,12 +1504,12 @@ EOT; $this->applyFilter($name, 'trim'); if ($required) { - $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required'); + $this->addRule($name, get_lang('Required field'), 'required'); } $this->addRule( $name, - get_lang('OnlyLettersAndNumbersAndSpaces'), + get_lang('Only lettersAndNumbersAndSpaces'), 'regex', '/^[a-zA-Z0-9ñÑ\s]+$/' ); @@ -1526,17 +1526,17 @@ EOT; $this->addHtml('
    - '.get_lang('ClickToSelectOrDragAndDropMultipleFilesOnTheUploadField').' + '.get_lang('Click on the box below to select files from your computer (you can use CTRL + clic to select various files at a time), or drag and drop some files from your desktop directly over the box below. The system will handle the rest!').'
    - '.get_lang('AddFiles').' + '.get_lang('Add files').'
    - '.get_lang('UploadFiles').' + '.get_lang('Click or drag and drop files here to upload them').'

    @@ -1557,7 +1557,7 @@ EOT; public function addPasswordRule($elementName, $groupName = '') { if (api_get_setting('security.check_password') == 'true') { - $message = get_lang('PassTooEasy').': '.api_generate_password(); + $message = get_lang('this password is too simple. Use a pass like this').': '.api_generate_password(); if (!empty($groupName)) { $groupObj = $this->getElement($groupName); @@ -1786,7 +1786,7 @@ EOT; // Update file name with new one from Chamilo $(data.context.children()[index]).parent().find('.file_name').html(file.name); var message = $('
    ').html( - $('').text('".addslashes(get_lang('UplUploadSucceeded'))."') + $('').text('".addslashes(get_lang('File upload succeeded!'))."') ); $(data.context.children()[index]).parent().append(message); }); @@ -1794,7 +1794,7 @@ EOT; ".$redirectCondition." }).on('fileuploadfail', function (e, data) { $.each(data.files, function (index) { - var failedMessage = '".addslashes(get_lang('UplUploadFailed'))."'; + var failedMessage = '".addslashes(get_lang('The file upload has failed.'))."'; var error = $('
    ').html( $('').text(failedMessage) ); diff --git a/main/inc/lib/javascript/chat/video.php b/main/inc/lib/javascript/chat/video.php index 1cd72f8026..a44fcee05c 100644 --- a/main/inc/lib/javascript/chat/video.php +++ b/main/inc/lib/javascript/chat/video.php @@ -41,7 +41,7 @@ $htmlHeadXtra[] = ''; -$nameTools = get_lang('ComposeMessage'); -$tpl = new Template(get_lang('ComposeMessage')); +$nameTools = get_lang('Compose message'); +$tpl = new Template(get_lang('Compose message')); /** * Shows the compose area + a list of users to select from. @@ -83,7 +83,7 @@ function show_compose_reply_to_message($message_id, $receiver_id, $tpl) $row = Database::fetch_array($result, 'ASSOC'); $userInfo = api_get_user_info($row['user_sender_id']); if (empty($row['user_sender_id']) || empty($userInfo)) { - $html = get_lang('InvalidMessageId'); + $html = get_lang('The id of the message to reply to is not valid.'); return $html; } @@ -98,7 +98,7 @@ function show_compose_to_user($receiver_id, $tpl) { $userInfo = api_get_user_info($receiver_id); $html = get_lang('To').': '.$userInfo['complete_name'].''; - $default['title'] = api_xml_http_response_encode(get_lang('EnterTitle')); + $default['title'] = api_xml_http_response_encode(get_lang('Please enter a title')); $default['users'] = [$receiver_id]; $html .= manageForm($default, null, '', $tpl); @@ -130,7 +130,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl if (isset($select_from_user_list)) { $form->addText( 'id_text_name', - get_lang('SendMessageTo'), + get_lang('Send to'), true, [ 'id' => 'id_text_name', @@ -138,19 +138,19 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl 'autocomplete' => 'off', ] ); - $form->addRule('id_text_name', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('id_text_name', get_lang('Required field'), 'required'); $form->addElement('html', ''); $form->addElement('hidden', 'user_list', 0, ['id' => 'user_list']); } else { if (!empty($sent_to)) { - $form->addLabel(get_lang('SendMessageTo'), $sent_to); + $form->addLabel(get_lang('Send to'), $sent_to); } if (empty($default['users'])) { //fb select $form->addElement( 'select_ajax', 'users', - get_lang('SendMessageTo'), + get_lang('Send to'), [], [ 'multiple' => 'multiple', @@ -165,7 +165,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl $userGroup = new UserGroup(); $group_info = $userGroup->get($group_id); - $form->addElement('label', get_lang('ToGroup'), api_xml_http_response_encode($group_info['name'])); + $form->addElement('label', get_lang('To social group'), api_xml_http_response_encode($group_info['name'])); $form->addElement('hidden', 'group_id', $group_id); $form->addElement('hidden', 'parent_id', $message_id); } @@ -181,14 +181,14 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl if (isset($_GET['re_id'])) { $message_reply_info = MessageManager::get_message_by_id($_GET['re_id']); - $default['title'] = get_lang('MailSubjectReplyShort').' '.Security::remove_XSS($message_reply_info['title']); + $default['title'] = get_lang('RE:').' '.Security::remove_XSS($message_reply_info['title']); $form->addHidden('re_id', (int) $_GET['re_id']); $form->addHidden('save_form', 'save_form'); // Adding reply mail $user_reply_info = api_get_user_info($message_reply_info['user_sender_id']); $default['content'] = '


    '.sprintf( - get_lang('XWroteY'), + get_lang('%s wrote:
    %s'), $user_reply_info['complete_name'], Security::filter_terms($message_reply_info['content']) ); @@ -202,12 +202,12 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl $fileListToString = !empty($attachments) ? implode('
    ', $attachments) : ''; $form->addLabel('', $fileListToString); } - $default['title'] = '['.get_lang('MailSubjectForwardShort').": ".Security::remove_XSS($message_reply_info['title']).']'; + $default['title'] = '['.get_lang('Fwd').": ".Security::remove_XSS($message_reply_info['title']).']'; $form->addHidden('forward_id', $forwardId); $form->addHidden('save_form', 'save_form'); $receiverInfo = api_get_user_info($message_reply_info['user_receiver_id']); - $forwardMessage = '---------- '.get_lang('ForwardedMessage').' ---------'.'
    '; + $forwardMessage = '---------- '.get_lang('Forwarded message').' ---------'.'
    '; $forwardMessage .= get_lang('Date').': '.api_get_local_time($message_reply_info['send_date']).'
    '; $forwardMessage .= get_lang('Subject').': '.Security::remove_XSS($message_reply_info['title']).'
    '; $forwardMessage .= get_lang('To').': '.$receiverInfo['complete_name'].' - '.$receiverInfo['email'].'
    '; @@ -220,7 +220,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl '
    - +
    @@ -237,9 +237,9 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl $form->addLabel( '', ''. - get_lang('AddOneMoreFile').' ('. + get_lang('Add one more file').' ('. sprintf( - get_lang('MaximunFileSizeX'), + get_lang('Maximun file size: %s'), format_file_size(api_get_setting('message_max_upload_filesize')) ).')' ); @@ -252,12 +252,12 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl src="'.api_get_path(WEB_CODE_PATH).'messages/record_audio.php">' ); - $form->addButtonSend(get_lang('SendMessage'), 'compose'); - $form->setRequiredNote('* '.get_lang('ThisFieldIsRequired').''); + $form->addButtonSend(get_lang('Send message'), 'compose'); + $form->setRequiredNote('* '.get_lang('Required field').''); if (!empty($group_id) && !empty($message_id)) { $message_info = MessageManager::get_message_by_id($message_id); - $default['title'] = get_lang('MailSubjectReplyShort')." ".$message_info['title']; + $default['title'] = get_lang('RE:')." ".$message_info['title']; } $form->setDefaults($default); $html = ''; @@ -300,7 +300,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl if ($res) { $userInfo = api_get_user_info($userId); Display::addFlash(Display::return_message( - get_lang('MessageSentTo')." ".$userInfo['complete_name_with_username']."", + get_lang('The message has been sent to')." ".$userInfo['complete_name_with_username']."", 'confirmation', false )); @@ -308,7 +308,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl } MessageManager::cleanAudioMessage(); } else { - Display::addFlash(Display::return_message('ErrorSendingMessage', 'error')); + Display::addFlash(Display::return_message('There was an error while trying to send the message.', 'error')); } } Security::clear_token(); @@ -328,7 +328,7 @@ if ($allowSocial) { $this_section = SECTION_SOCIAL; $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'social/home.php', - 'name' => get_lang('SocialNetwork'), + 'name' => get_lang('Social network'), ]; } else { $this_section = SECTION_MYPROFILE; @@ -348,9 +348,9 @@ $social_right_content = null; if ($group_id != 0) { $social_right_content .= '
    '; $social_right_content .= ''. - Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage'))).''; + Display::return_icon('back.png', api_xml_http_response_encode(get_lang('Compose message'))).''; $social_right_content .= ''. - Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('ComposeMessage'))).''; + Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('Compose message'))).''; $social_right_content .= '
    '; } else { if ($allowSocial) { @@ -358,7 +358,7 @@ if ($group_id != 0) { $social_right_content .= '
    '; if (api_get_setting('allow_message_tool') === 'true') { $social_right_content .= ''. - Display::return_icon('message_new.png', get_lang('ComposeMessage')).''; + Display::return_icon('message_new.png', get_lang('Compose message')).''; $social_right_content .= ''. Display::return_icon('inbox.png', get_lang('Inbox')).''; $social_right_content .= ''. @@ -425,7 +425,7 @@ if (!isset($_POST['compose'])) { } $social_right_content .= manageForm($default, null, null, $tpl); } else { - $social_right_content .= Display::return_message(get_lang('ErrorSendingMessage'), 'error'); + $social_right_content .= Display::return_message(get_lang('There was an error while trying to send the message.'), 'error'); } } } diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 5381d13b75..99d0248b02 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -33,7 +33,7 @@ if ($allowSocial) { $this_section = SECTION_SOCIAL; $interbreadcrumb[] = [ 'url' => api_get_path(WEB_PATH).'main/social/home.php', - 'name' => get_lang('SocialNetwork'), + 'name' => get_lang('Social network'), ]; } else { $this_section = SECTION_MYPROFILE; @@ -48,7 +48,7 @@ $interbreadcrumb[] = [ $actions = ''; if ($allowMessage) { $actions .= ''. - Display::return_icon('message_new.png', get_lang('ComposeMessage')).''; + Display::return_icon('message_new.png', get_lang('Compose message')).''; $actions .= ''. Display::return_icon('inbox.png', get_lang('Inbox')).''; $actions .= ''. diff --git a/main/messages/record_audio.php b/main/messages/record_audio.php index 8999225e7b..e1b39967a0 100644 --- a/main/messages/record_audio.php +++ b/main/messages/record_audio.php @@ -12,7 +12,7 @@ $htmlHeadXtra[] = ''; $htmlHeadXtra[] = api_get_js('record_audio/record_audio.js'); -$tpl = new Template(get_lang('ComposeMessage'), false, false, false, true); +$tpl = new Template(get_lang('Compose message'), false, false, false, true); $record = $tpl->get_template('message/record_audio.tpl'); $tpl->assign('user_id', api_get_user_id()); diff --git a/main/messages/view_message.php b/main/messages/view_message.php index 65e839124d..9a96c180ca 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -23,7 +23,7 @@ if (empty($messageId)) { if ($allowSocial) { $this_section = SECTION_SOCIAL; - $interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'main/social/home.php', 'name' => get_lang('SocialNetwork')]; + $interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'main/social/home.php', 'name' => get_lang('Social network')]; } else { $this_section = SECTION_MYPROFILE; $interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'main/auth/profile.php', 'name' => get_lang('Profile')]; @@ -33,7 +33,7 @@ $interbreadcrumb[] = ['url' => 'inbox.php', 'name' => get_lang('Messages')]; $social_right_content = '
    '; if ($allowMessage) { $social_right_content .= ''. - Display::return_icon('new-message.png', get_lang('ComposeMessage')).''; + Display::return_icon('new-message.png', get_lang('Compose message')).''; $social_right_content .= ''. Display::return_icon('inbox.png', get_lang('Inbox')).''; $social_right_content .= ''. diff --git a/main/portfolio/add_category.php b/main/portfolio/add_category.php index 56b7c04432..68d06140bb 100644 --- a/main/portfolio/add_category.php +++ b/main/portfolio/add_category.php @@ -26,14 +26,14 @@ if ($form->validate()) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('CategoryAdded'), 'success') + Display::return_message(get_lang('Category added'), 'success') ); header("Location: $baseUrl"); exit; } -$toolName = get_lang('AddCategory'); +$toolName = get_lang('Add category'); $interbreadcrumb[] = [ 'name' => get_lang('Portfolio'), 'url' => $baseUrl, diff --git a/main/portfolio/add_item.php b/main/portfolio/add_item.php index 44811b8931..3f5b11caaf 100644 --- a/main/portfolio/add_item.php +++ b/main/portfolio/add_item.php @@ -44,14 +44,14 @@ if ($form->validate()) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('PortfolioItemAdded'), 'success') + Display::return_message(get_lang('Portfolio item added'), 'success') ); header("Location: $baseUrl"); exit; } -$toolName = get_lang('AddPortfolioItem'); +$toolName = get_lang('Add item to portfolio'); $interbreadcrumb[] = [ 'name' => get_lang('Portfolio'), 'url' => $baseUrl, diff --git a/main/portfolio/edit_category.php b/main/portfolio/edit_category.php index f9e5f13d2e..8df69e5411 100644 --- a/main/portfolio/edit_category.php +++ b/main/portfolio/edit_category.php @@ -26,14 +26,14 @@ if ($form->validate()) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('Updated'), 'success') + Display::return_message(get_lang('Update successful'), 'success') ); header("Location: $baseUrl"); exit; } -$toolName = get_lang('EditCategory'); +$toolName = get_lang('Edit this category'); $interbreadcrumb[] = [ 'name' => get_lang('Portfolio'), 'url' => $baseUrl, diff --git a/main/portfolio/edit_item.php b/main/portfolio/edit_item.php index 6de3ac9338..e0e6ce294d 100644 --- a/main/portfolio/edit_item.php +++ b/main/portfolio/edit_item.php @@ -39,14 +39,14 @@ if ($form->validate()) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('ItemUpdated'), 'success') + Display::return_message(get_lang('Item updated'), 'success') ); header("Location: $baseUrl"); exit; } -$toolName = get_lang('EditPortfolioItem'); +$toolName = get_lang('Edit portfolio item'); $interbreadcrumb[] = [ 'name' => get_lang('Portfolio'), 'url' => $baseUrl, diff --git a/main/portfolio/index.php b/main/portfolio/index.php index 057bbc34b1..88259536c0 100755 --- a/main/portfolio/index.php +++ b/main/portfolio/index.php @@ -114,7 +114,7 @@ switch ($action) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('VisibilityChanged'), 'success') + Display::return_message(get_lang('The visibility has been changed.'), 'success') ); header("Location: $baseUrl"); @@ -137,7 +137,7 @@ switch ($action) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('CategoryDeleted'), 'success') + Display::return_message(get_lang('The category has been deleted.'), 'success') ); header("Location: $baseUrl"); @@ -182,7 +182,7 @@ switch ($action) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('VisibilityChanged'), 'success') + Display::return_message(get_lang('The visibility has been changed.'), 'success') ); header("Location: $baseUrl"); @@ -205,7 +205,7 @@ switch ($action) { $em->flush(); Display::addFlash( - Display::return_message(get_lang('ItemDeleted'), 'success') + Display::return_message(get_lang('Item deleted'), 'success') ); header("Location: $baseUrl"); diff --git a/main/portfolio/list.php b/main/portfolio/list.php index 3b28641761..578c7d59db 100644 --- a/main/portfolio/list.php +++ b/main/portfolio/list.php @@ -8,7 +8,7 @@ if ($currentUserId == $user->getId()) { $baseUrl.'action=add_item' ); $actions[] = Display::url( - Display::return_icon('folder.png', get_lang('AddCategory'), [], ICON_SIZE_MEDIUM), + Display::return_icon('folder.png', get_lang('Add category'), [], ICON_SIZE_MEDIUM), $baseUrl.'action=add_category' ); $actions[] = Display::url( diff --git a/main/ticket/assign_tickets.php b/main/ticket/assign_tickets.php index 1389f787c9..ddb32f055b 100644 --- a/main/ticket/assign_tickets.php +++ b/main/ticket/assign_tickets.php @@ -44,20 +44,20 @@ $result_forum = Database::query($sql_forum); echo '
    -
    '.get_lang('PleaseSelectTasks').'
    +
    '.get_lang('Please select tasks').'
    '; echo '
    '; echo '
    -
    '.get_lang('PleaseSelectThread').'
    +
    '.get_lang('Please selectThread').'
    '; echo '
    diff --git a/main/upload/form.document.php b/main/upload/form.document.php index de251f0fda..7e60e94a84 100755 --- a/main/upload/form.document.php +++ b/main/upload/form.document.php @@ -12,7 +12,7 @@ /** * Just display the form needed to upload a SCORM and give its settings. */ -$nameTools = get_lang('FileUpload'); +$nameTools = get_lang('File upload'); $interbreadcrumb[] = ["url" => "../lp/lp_controller.php?action=list", "name" => get_lang(TOOL_DOCUMENT)]; Display::display_header($nameTools, "Doc"); // Show the title diff --git a/main/upload/form.scorm.php b/main/upload/form.scorm.php index 49b98fc197..dd38eb336f 100755 --- a/main/upload/form.scorm.php +++ b/main/upload/form.scorm.php @@ -39,10 +39,10 @@ function get_zip_files_in_garbage() /** * Just display the form needed to upload a SCORM and give its settings. */ -$nameTools = get_lang('FileUpload'); +$nameTools = get_lang('File upload'); $interbreadcrumb[] = [ 'url' => api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=list&'.api_get_cidreq(), - 'name' => get_lang('ToolLearnpath'), + 'name' => get_lang('Learning path'), ]; Display::display_header($nameTools, 'Path'); @@ -52,7 +52,7 @@ require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; echo '
    '; echo ''. - Display::return_icon('back.png', get_lang('ReturnToLearningPaths'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('back.png', get_lang('Back to learning paths'), '', ICON_SIZE_MEDIUM).''; echo '
    '; $form = new FormValidator( @@ -69,15 +69,15 @@ $form->addHeader($nameTools); $form->addLabel(null, Display::return_icon('scorm_logo.jpg', null, ['style' => 'width:230px;height:100px'])); $form->addElement('hidden', 'curdirpath', $path); $form->addElement('hidden', 'tool', $my_tool); -$form->addElement('file', 'user_file', get_lang('FileToUpload')); +$form->addElement('file', 'user_file', get_lang('SCORM or AICC file to upload')); $form->addProgress(); -$form->addRule('user_file', get_lang('ThisFieldIsRequired'), 'required'); +$form->addRule('user_file', get_lang('Required field'), 'required'); unset($content_origins[0]); unset($content_origins[1]); if (api_get_setting('search_enabled') == 'true') { - $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument')); + $form->addElement('checkbox', 'index_document', '', get_lang('Index document text?')); $specific_fields = get_specific_field_list(); foreach ($specific_fields as $specific_field) { $form->addElement('text', $specific_field['code'], $specific_field['name'].' : '); @@ -85,11 +85,11 @@ if (api_get_setting('search_enabled') == 'true') { } if (api_is_platform_admin()) { - $form->addElement('checkbox', 'use_max_score', null, get_lang('UseMaxScore100')); + $form->addElement('checkbox', 'use_max_score', null, get_lang('Use default maximum score of 100')); } if (api_get_configuration_value('allow_htaccess_import_from_scorm')) { - $form->addElement('checkbox', 'allow_htaccess', null, get_lang('AllowHtaccessScormImport')); + $form->addElement('checkbox', 'allow_htaccess', null, get_lang('Allow htaccess in the SCORM import')); } $form->addButtonUpload(get_lang('Upload')); @@ -98,7 +98,7 @@ $form->addButtonUpload(get_lang('Upload')); $defaults = ['index_document' => 'checked="checked"', 'use_max_score' => 1]; $form->setDefaults($defaults); echo Display::return_message( - Display::tag('strong', get_lang('SupportedScormContentMakers')).': '.implode(', ', $content_origins), + Display::tag('strong', get_lang('SCORM Authoring tools supported')).': '.implode(', ', $content_origins), 'normal', false ); diff --git a/main/upload/upload.document.php b/main/upload/upload.document.php index e1f59c21ee..61f8ec41c6 100755 --- a/main/upload/upload.document.php +++ b/main/upload/upload.document.php @@ -33,7 +33,7 @@ if (!DocumentManager::get_document_id($_course, $path)) { /** * Header. */ -$nameTools = get_lang('UplUploadDocument'); +$nameTools = get_lang('Upload documents'); $interbreadcrumb[] = [ "url" => api_get_path(WEB_CODE_PATH)."document/document.php?curdirpath=".urlencode($path).'&'.api_get_cidreq(), "name" => get_lang('Documents'), @@ -146,10 +146,10 @@ if (isset($_POST['create_dir']) && $_POST['dirname'] != '') { $_POST['dirname'] ); if ($created_dir) { - echo Display::return_message(get_lang('DirCr')); + echo Display::return_message(get_lang('Folder created')); $path = $created_dir; } else { - echo Display::return_message(get_lang('CannotCreateDir')); + echo Display::return_message(get_lang('Unable to create the folder.')); } } @@ -157,9 +157,9 @@ if (isset($_GET['createdir'])) { //create the form that asks for the directory name $new_folder_text = ''; $new_folder_text .= ''; - $new_folder_text .= get_lang('NewDir').' '; + $new_folder_text .= get_lang('Name of the new folder').' '; $new_folder_text .= ''; - $new_folder_text .= ''; + $new_folder_text .= ''; $new_folder_text .= ''; //show the form echo Display::return_message($new_folder_text, 'normal'); @@ -168,7 +168,7 @@ if (isset($_GET['createdir'])) {

    - +

    --
    --
    -   
    -   
    -    +-
    +-
    +   
    +   
    +    - + -

    +

    */ require_once __DIR__.'/../inc/global.inc.php'; @@ -50,11 +48,11 @@ if (isset($_POST['convert'])) { if (!empty($o_ppt->error)) { $errorMessage = $o_ppt->error; } else { - $errorMessage = get_lang('OogieUnknownError'); + $errorMessage = get_lang('The conversion failed for an unknown reason.
    Please contact your administrator to get more information.'); } } } else { - $errorMessage = get_lang('OogieBadExtension'); + $errorMessage = get_lang('Please upload presentations only. Filename extension should be .ppt or .odp'); } } } @@ -68,36 +66,36 @@ if (!$is_allowed_to_edit) { api_not_allowed(true); } -$interbreadcrumb[] = ["url" => "../lp/lp_controller.php?action=list", "name" => get_lang("Doc")]; +$interbreadcrumb[] = ["url" => "../lp/lp_controller.php?action=list", "name" => get_lang("Document")]; -$nameTools = get_lang("OogieConversionPowerPoint"); +$nameTools = get_lang("Chamilo RAPID : PowerPoint conversion"); Display :: display_header($nameTools); -$message = get_lang("WelcomeOogieConverter"); +$message = get_lang('Welcome to Chamilo RAPID
    • Browse your hard disk to find any .ppt or .odp file
    • Upload it to Oogie. It will convert it into a SCORM course.
    • You will then be allowed to add audio comments on each slide and insert test and activities between slides.'); if (!empty($errorMessage)) { echo Display::return_message($errorMessage, 'warning', false); } -$div_upload_limit = get_lang('UploadMaxSize').' : '.ini_get('post_max_size'); +$div_upload_limit = get_lang('Upload max size').' : '.ini_get('post_max_size'); $form = new FormValidator('upload_ppt', 'POST', '?'.api_get_cidreq(), ''); -$form->addElement('header', get_lang("WelcomeOogieSubtitle")); +$form->addElement('header', get_lang("A PowerPoint to SCORM Courses converter")); $form->addElement('html', Display::return_message($message, 'info', false)); $form->addElement('file', 'user_file', [Display::return_icon('powerpoint_big.gif'), $div_upload_limit]); -$form->addElement('checkbox', 'take_slide_name', '', get_lang('TakeSlideName')); -$options = ChamiloApi::getDocumentConversionSizes(); -$form->addElement('select', 'slide_size', get_lang('SlideSize'), $options); +$form->addElement('checkbox', 'take_slide_name', '', get_lang('Use the slides names as course learning object names')); +$options = ChamiloApi::getDocumentumentConversionSizes(); +$form->addElement('select', 'slide_size', get_lang('Size of the slides'), $options); if (api_get_setting('search_enabled') === 'true') { require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; $specific_fields = get_specific_field_list(); - $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument')); - $form->addSelectLanguage('language', get_lang('SearchFeatureDocumentLanguage')); + $form->addElement('checkbox', 'index_document', '', get_lang('Index document text?ument')); + $form->addSelectLanguage('language', get_lang('SearchFeatureDocumentumentLanguage')); foreach ($specific_fields as $specific_field) { $form->addElement('text', $specific_field['code'], $specific_field['name'].' : '); } } -$form->addButtonUpload(get_lang('ConvertToLP'), 'convert'); +$form->addButtonUpload(get_lang('Convert to course'), 'convert'); $form->addElement('hidden', 'ppt2lp', 'true'); $form->addProgress(); $size = api_get_setting('service_ppt2lp', 'size'); @@ -108,6 +106,5 @@ $defaults = [ ]; $form->setDefaults($defaults); -// display the form $form->display(); Display::display_footer(); diff --git a/main/upload/upload_word.php b/main/upload/upload_word.php index f7f3c4a8ca..9cb7acd9fc 100755 --- a/main/upload/upload_word.php +++ b/main/upload/upload_word.php @@ -6,8 +6,6 @@ * redirect * the process here to do what needs to be done with each file. * - * @package chamilo.upload - * * @author Yannick Warnier */ require_once __DIR__.'/../inc/global.inc.php'; @@ -65,11 +63,11 @@ if (isset($_POST['convert'])) { if (!empty($o_doc->error)) { $errorMessage = $o_doc->error; } else { - $errorMessage = get_lang('OogieUnknownError'); + $errorMessage = get_lang('The conversion failed for an unknown reason.
      Please contact your administrator to get more information.'); } } } else { - $errorMessage = get_lang('WoogieBadExtension'); + $errorMessage = get_lang('Please upload text documents only. Filename extension should be .doc, .docx or .odt'); } } } @@ -81,13 +79,13 @@ if (!$is_allowed_to_edit) { api_not_allowed(true); } -$interbreadcrumb[] = ["url" => "../lp/lp_controller.php?action=list", "name" => get_lang("Doc")]; -$nameTools = get_lang("WoogieConversionPowerPoint"); +$interbreadcrumb[] = ["url" => "../lp/lp_controller.php?action=list", "name" => get_lang("Document")]; +$nameTools = get_lang("Woogie : Word conversion"); Display :: display_header($nameTools); echo ''. - get_lang("WelcomeWoogieSubtitle").'
      '; -$message = get_lang("WelcomeWoogieConverter"); + get_lang("MS Word to course converter").'
      '; +$message = get_lang('Welcome to Woogie Rapid Learning
      • Browse your hard disk to find any .doc, .sxw or .odt file
      • Upload it to Woogie. It will convert it into a SCORM course
      • You will then be able to add audio comments on each page and insert quizzes and other activities between pages
      '); echo '
      '; $s_style = "border-width: 1px; border-style: solid; @@ -131,7 +129,7 @@ $form = new FormValidator('update_course', 'POST', '', '', 'style="margin: 0;"') $form->addElement('html', '
      '); -$div_upload_limit = '  '.get_lang('UploadMaxSize').' : '.ini_get('post_max_size'); +$div_upload_limit = '  '.get_lang('Upload max size').' : '.ini_get('post_max_size'); $renderer = $form->defaultRenderer(); // set template for user_file element @@ -156,12 +154,12 @@ $renderer->setCustomElementTemplate($user_file_template); $form->addElement('file', 'user_file', Display::return_icon('word_big.gif')); if (api_get_setting('search_enabled') === 'true') { - $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument')); + $form->addElement('checkbox', 'index_document', '', get_lang('Index document text?ument')); $form->addElement('html', '
      '); $form->addElement( 'html', get_lang( - 'SearchFeatureDocumentLanguage' + 'SearchFeatureDocumentumentLanguage' ).':          '.api_get_languages_combo() ); $form->addElement('html', '
      '); @@ -172,12 +170,12 @@ if (api_get_setting('search_enabled') === 'true') { } /* - * commented because SplitStepsPerChapter is not stable at all - * $form -> addElement ('radio', 'split_steps',null, get_lang('SplitStepsPerPage'),'per_page'); - * $form -> addElement ('radio', 'split_steps',null, get_lang('SplitStepsPerChapter'),'per_chapter'); + * commented because A section, a learning object is not stable at all + * $form -> addElement ('radio', 'split_steps',null, get_lang('A page, a learning object'),'per_page'); + * $form -> addElement ('radio', 'split_steps',null, get_lang('A section, a learning object'),'per_chapter'); */ $form->addElement('hidden', 'split_steps', 'per_page'); -$form->addElement('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"'); +$form->addElement('submit', 'convert', get_lang('Convert to course'), 'class="convert_button"'); $form->addElement('hidden', 'woogie', 'true'); $form->addProgress(); $defaults = ['split_steps' => 'per_page', 'index_document' => 'checked="checked"']; diff --git a/main/webservices/cm_webservice.php b/main/webservices/cm_webservice.php index a19d93fb23..53cf210bd4 100755 --- a/main/webservices/cm_webservice.php +++ b/main/webservices/cm_webservice.php @@ -142,20 +142,20 @@ class WSCM if ($uData->getExpirationDate() > $now || !$uData->getExpirationDate()) { return "valid"; } else { - return get_lang('AccountExpired'); + return get_lang('Account expired'); } } else { - return get_lang('AccountInactive'); + return get_lang('Account inactive'); } } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } else { - return get_lang('AccountURLInactive'); + return get_lang('Account inactive for this URL'); } } - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } /** diff --git a/main/webservices/cm_webservice_announcements.php b/main/webservices/cm_webservice_announcements.php index 3d385372e3..ccd090c08b 100755 --- a/main/webservices/cm_webservice_announcements.php +++ b/main/webservices/cm_webservice_announcements.php @@ -26,7 +26,7 @@ class WSCMAnnouncements extends WSCM return $announcements; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -80,7 +80,7 @@ class WSCMAnnouncements extends WSCM $announcements[0][$field_table] ) : $announcements[0][$field_table]; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } diff --git a/main/webservices/cm_webservice_courses.php b/main/webservices/cm_webservice_courses.php index 27d5138637..ab81aa6b2e 100755 --- a/main/webservices/cm_webservice_courses.php +++ b/main/webservices/cm_webservice_courses.php @@ -27,7 +27,7 @@ class WSCMCourses extends WSCM return $courses_id; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -38,7 +38,7 @@ class WSCMCourses extends WSCM return $course_info['title']; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } } diff --git a/main/webservices/cm_webservice_forum.php b/main/webservices/cm_webservice_forum.php index 39b09725a9..daac7038fb 100755 --- a/main/webservices/cm_webservice_forum.php +++ b/main/webservices/cm_webservice_forum.php @@ -28,7 +28,7 @@ class WSCMForum extends WSCM return $foruns_id; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -55,7 +55,7 @@ class WSCMForum extends WSCM return $forum_title; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -76,7 +76,7 @@ class WSCMForum extends WSCM return $threads_id; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -122,7 +122,7 @@ class WSCMForum extends WSCM return $thread_info[$field_table]; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -149,7 +149,7 @@ class WSCMForum extends WSCM return $thread_info[$field_table]; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -192,7 +192,7 @@ class WSCMForum extends WSCM return $posts_id; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -238,7 +238,7 @@ class WSCMForum extends WSCM return ($htmlcode) ? html_entity_decode($post_info[$field_table]) : $post_info[$field_table]; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -288,7 +288,7 @@ class WSCMForum extends WSCM return "Post enviado!"; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } } diff --git a/main/webservices/cm_webservice_inbox.php b/main/webservices/cm_webservice_inbox.php index f22364d940..597f6e5c0b 100755 --- a/main/webservices/cm_webservice_inbox.php +++ b/main/webservices/cm_webservice_inbox.php @@ -55,7 +55,7 @@ class WSCMInbox extends WSCM return $message; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -97,7 +97,7 @@ class WSCMInbox extends WSCM return $htmlcode ? html_entity_decode($result[0]) : $result[0]; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -123,7 +123,7 @@ class WSCMInbox extends WSCM return $message; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -161,7 +161,7 @@ class WSCMInbox extends WSCM return $htmlcode ? html_entity_decode($result[0]) : $result[0]; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } @@ -197,7 +197,7 @@ class WSCMInbox extends WSCM return $inbox_last_id; } else { - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } } diff --git a/main/webservices/cm_webservice_user.php b/main/webservices/cm_webservice_user.php index 87187271f0..b0f1eba836 100755 --- a/main/webservices/cm_webservice_user.php +++ b/main/webservices/cm_webservice_user.php @@ -117,7 +117,7 @@ class WSCMUser extends WSCM if ($count_is_true) { return Display::return_message( api_htmlentities( - get_lang('InvitationHasBeenSent'), + get_lang('The invitation has been sent'), ENT_QUOTES, $charset ), @@ -127,7 +127,7 @@ class WSCMUser extends WSCM } else { return Display::return_message( api_htmlentities( - get_lang('YouAlreadySentAnInvitation'), + get_lang('You already sent an invitation'), ENT_QUOTES, $charset ), @@ -137,7 +137,7 @@ class WSCMUser extends WSCM } } - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } public function accept_friend($username, $password, $userfriend_id) @@ -151,10 +151,10 @@ class WSCMUser extends WSCM ); SocialManager::invitation_accepted($userfriend_id, $user_id); - return get_lang('AddedContactToList'); + return get_lang('Added contact to list'); } - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } public function denied_invitation($username, $password, $userfriend_id) @@ -163,10 +163,10 @@ class WSCMUser extends WSCM $user_id = UserManager::get_user_id_from_username($username); SocialManager::invitation_denied($userfriend_id, $user_id); - return get_lang('InvitationDenied'); + return get_lang('Invitation denied'); } - return get_lang('InvalidId'); + return get_lang('Login failed - incorrect login or password.'); } /** diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index 1af17e508f..92f1cc03c7 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -3588,14 +3588,14 @@ function WSCourseDescription($params) $result = Database::query($sql); $default_titles = [ - get_lang('GeneralDescription'), + get_lang('Description'), get_lang('Objectives'), get_lang('Topics'), get_lang('Methodology'), - get_lang('CourseMaterial'), - get_lang('HumanAndTechnicalResources'), + get_lang('Course material'), + get_lang('Resources'), get_lang('Assessment'), - get_lang('AddCategory'), + get_lang('Add category'), ]; for ($x = 1; $x < 9; $x++) {