Merge remote-tracking branch 'origin/1.10.x' into 1.11.x

pull/2487/head
jmontoyaa 9 years ago
commit 60ef413c8c
  1. 3
      main/inc/lib/course.lib.php
  2. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/nl.js
  3. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/no.js
  4. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/pl.js
  5. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/pt-br.js
  6. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/pt.js
  7. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/ro.js
  8. 2
      main/inc/lib/javascript/ckeditor/plugins/asciimath/lang/ru.js

@ -4875,7 +4875,7 @@ class CourseManager
{
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$table_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql = "SELECT count(id) FROM $table_course c";
$sql = "SELECT count(c.id) FROM $table_course c";
if (!empty($access_url_id) && $access_url_id == intval($access_url_id)) {
$sql .= ", $table_course_rel_access_url u
WHERE c.id = u.c_id AND u.access_url_id = $access_url_id";
@ -4892,6 +4892,7 @@ class CourseManager
$res = Database::query($sql);
$row = Database::fetch_row($res);
return $row[0];
}

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'nl', {
CKEDITOR.plugins.setLang( 'asciimath', 'nl', {
title: 'Wiskunde in TeX',
button: 'Wiskunde',
dialogInput: 'Typ hier uw TeX',

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'no', {
CKEDITOR.plugins.setLang( 'asciimath', 'no', {
title: 'Matematikk i TeX',
button: 'Matte',
dialogInput: 'Skriv TeX-koden her',

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'pl', {
CKEDITOR.plugins.setLang( 'asciimath', 'pl', {
title: 'Wzory matematyczne w TeX',
button: 'Wzory matematyczne',
dialogInput: 'Wpisz wyrażenie w TeX',

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'pt-br', {
CKEDITOR.plugins.setLang( 'asciimath', 'pt-br', {
title: 'Matemática em TeX',
button: 'Matemática',
dialogInput: 'Escreva seu TeX aqui',

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'pt', {
CKEDITOR.plugins.setLang( 'asciimath', 'pt', {
title: 'Matemáticas em TeX',
button: 'Matemática',
dialogInput: 'Escreva aqui o seu Tex',

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'ro', {
CKEDITOR.plugins.setLang( 'asciimath', 'ro', {
title: 'Matematici in TeX',
button: 'Matematici',
dialogInput: 'Scrie TeX-ul aici',

@ -2,7 +2,7 @@
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'mathjax', 'ru', {
CKEDITOR.plugins.setLang( 'asciimath', 'ru', {
title: 'Математика в TeX-системе',
button: 'Математика',
dialogInput: 'Введите здесь TeX',

Loading…
Cancel
Save