mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 00:42:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48616-master' of git://github.com/jethac/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2015-01-26 23:47:14 +01:00
commit d82ab7bf22
7 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/editor/atto/plugins/charmap/lang/en/atto_charmap.php
View File

@ -27,6 +27,7 @@ $string['pluginname'] = 'Insert character';
// The following are not ordered on purpose, they are kept
// in the order in which they appear in the user interface.
$string['interrobang'] = 'interrobang';
$string['nobreakspace'] = 'no-break space';
$string['ampersand'] = 'ampersand';
$string['quotationmark'] = 'quotation mark';
@ -123,16 +124,19 @@ $string['acircumflex_caps'] = 'A - circumflex';
$string['atilde_caps'] = 'A - tilde';
$string['adiaeresis_caps'] = 'A - diaeresis';
$string['aringabove_caps'] = 'A - ring above';
$string['amacron_caps'] = 'A - macron';
$string['ligatureae_caps'] = 'ligature AE';
$string['ccedilla_caps'] = 'C - cedilla';
$string['egrave_caps'] = 'E - grave';
$string['eacute_caps'] = 'E - acute';
$string['ecircumflex_caps'] = 'E - circumflex';
$string['ediaeresis_caps'] = 'E - diaeresis';
$string['emacron_caps'] = 'E - macron';
$string['igrave_caps'] = 'I - grave';
$string['iacute_caps'] = 'I - acute';
$string['icircumflex_caps'] = 'I - circumflex';
$string['idiaeresis_caps'] = 'I - diaeresis';
$string['imacron_caps'] = 'I - macron';
$string['eth_caps'] = 'ETH';
$string['ntilde_caps'] = 'N - tilde';
$string['ograve_caps'] = 'O - grave';
@ -141,12 +145,14 @@ $string['ocircumflex_caps'] = 'O - circumflex';
$string['otilde_caps'] = 'O - tilde';
$string['odiaeresis_caps'] = 'O - diaeresis';
$string['oslash_caps'] = 'O - slash';
$string['omacron_caps'] = 'O - macron';
$string['ligatureoe_caps'] = 'ligature OE';
$string['scaron_caps'] = 'S - caron';
$string['ugrave_caps'] = 'U - grave';
$string['uacute_caps'] = 'U - acute';
$string['ucircumflex_caps'] = 'U - circumflex';
$string['udiaeresis_caps'] = 'U - diaeresis';
$string['umacron_caps'] = 'U - macron';
$string['yacute_caps'] = 'Y - acute';
$string['ydiaeresis_caps'] = 'Y - diaeresis';
$string['thorn_caps'] = 'THORN';
@ -156,16 +162,19 @@ $string['acircumflex'] = 'a - circumflex';
$string['atilde'] = 'a - tilde';
$string['adiaeresis'] = 'a - diaeresis';
$string['aringabove'] = 'a - ring above';
$string['amacron'] = 'a - macron';
$string['ligatureae'] = 'ligature ae';
$string['ccedilla'] = 'c - cedilla';
$string['egrave'] = 'e - grave';
$string['eacute'] = 'e - acute';
$string['ecircumflex'] = 'e - circumflex';
$string['ediaeresis'] = 'e - diaeresis';
$string['emacron'] = 'e - macron';
$string['igrave'] = 'i - grave';
$string['iacute'] = 'i - acute';
$string['icircumflex'] = 'i - circumflex';
$string['idiaeresis'] = 'i - diaeresis';
$string['imacron'] = 'i - macron';
$string['eth'] = 'eth';
$string['ntilde'] = 'n - tilde';
$string['ograve'] = 'o - grave';
@ -174,12 +183,14 @@ $string['ocircumflex'] = 'o - circumflex';
$string['otilde'] = 'o - tilde';
$string['odiaeresis'] = 'o - diaeresis';
$string['oslash'] = 'o slash';
$string['omacron'] = 'o - macron';
$string['ligatureoe'] = 'ligature oe';
$string['scaron'] = 's - caron';
$string['ugrave'] = 'u - grave';
$string['uacute'] = 'u - acute';
$string['ucircumflex'] = 'u - circumflex';
$string['udiaeresis'] = 'u - diaeresis';
$string['umacron'] = 'u - macron';
$string['yacute'] = 'y - acute';
$string['thorn'] = 'thorn';
$string['ydiaeresis'] = 'y - diaeresis';

11
lib/editor/atto/plugins/charmap/lib.php
View File

@ -36,6 +36,17 @@ function atto_charmap_strings_for_js() {
// which are enabled in the JavaScript part of this plugin.
$PAGE->requires->strings_for_js(
array(
'amacron',
'emacron',
'imacron',
'omacron',
'umacron',
'amacron_caps',
'emacron_caps',
'imacron_caps',
'omacron_caps',
'umacron_caps',
'interrobang',
'insertcharacter',
'nobreakspace',
'ampersand',

5
lib/editor/atto/plugins/charmap/tests/behat/charmap.feature
View File

@ -11,8 +11,7 @@ Feature: Atto charmap button
And I select the text in the "Description" Atto editor
When I click on "Show more buttons" "button"
And I click on "Insert character" "button"
And I click on "copyright sign" "button"
And I click on "a - macron" "button"
And I press "Update profile"
And I follow "Edit profile"
Then I should see "(c)"
Then I should see "ā"

11
lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js vendored
View File

@ -48,6 +48,7 @@ var COMPONENTNAME = 'atto_charmap',
[' ', ' ', true, 'nobreakspace'],
['&', '&', true, 'ampersand'],
['"', '"', true, 'quotationmark'],
['‽', '‽', true, 'interrobang'],
// Finance.
['¢', '¢', true, 'centsign'],
['€', '€', true, 'eurosign'],
@ -147,16 +148,19 @@ var COMPONENTNAME = 'atto_charmap',
['Ã', 'Ã', true, 'atilde_caps'],
['Ä', 'Ä', true, 'adiaeresis_caps'],
['Å', 'Å', true, 'aringabove_caps'],
['Ā', 'Ā', true, 'amacron_caps'],
['Æ', 'Æ', true, 'ligatureae_caps'],
['Ç', 'Ç', true, 'ccedilla_caps'],
['È', 'È', true, 'egrave_caps'],
['É', 'É', true, 'eacute_caps'],
['Ê', 'Ê', true, 'ecircumflex_caps'],
['Ë', 'Ë', true, 'ediaeresis_caps'],
['Ē', 'Ē', true, 'emacron_caps'],
['Ì', 'Ì', true, 'igrave_caps'],
['Í', 'Í', true, 'iacute_caps'],
['Î', 'Î', true, 'icircumflex_caps'],
['Ï', 'Ï', true, 'idiaeresis_caps'],
['Ī', 'Ī', true, 'imacron_caps'],
['Ð', 'Ð', true, 'eth_caps'],
['Ñ', 'Ñ', true, 'ntilde_caps'],
['Ò', 'Ò', true, 'ograve_caps'],
@ -165,12 +169,14 @@ var COMPONENTNAME = 'atto_charmap',
['Õ', 'Õ', true, 'otilde_caps'],
['Ö', 'Ö', true, 'odiaeresis_caps'],
['Ø', 'Ø', true, 'oslash_caps'],
['Ō', 'Ō', true, 'omacron_caps'],
['Œ', 'Œ', true, 'ligatureoe_caps'],
['Š', 'Š', true, 'scaron_caps'],
['Ù', 'Ù', true, 'ugrave_caps'],
['Ú', 'Ú', true, 'uacute_caps'],
['Û', 'Û', true, 'ucircumflex_caps'],
['Ü', 'Ü', true, 'udiaeresis_caps'],
['Ū', 'Ū', true, 'umacron_caps'],
['Ý', 'Ý', true, 'yacute_caps'],
['Ÿ', 'Ÿ', true, 'ydiaeresis_caps'],
['Þ', 'Þ', true, 'thorn_caps'],
@ -180,16 +186,19 @@ var COMPONENTNAME = 'atto_charmap',
['ã', 'ã', true, 'atilde'],
['ä', 'ä', true, 'adiaeresis'],
['å', 'å', true, 'aringabove'],
['ā', 'ā', true, 'amacron'],
['æ', 'æ', true, 'ligatureae'],
['ç', 'ç', true, 'ccedilla'],
['è', 'è', true, 'egrave'],
['é', 'é', true, 'eacute'],
['ê', 'ê', true, 'ecircumflex'],
['ë', 'ë', true, 'ediaeresis'],
['ē', 'ē', true, 'emacron'],
['ì', 'ì', true, 'igrave'],
['í', 'í', true, 'iacute'],
['î', 'î', true, 'icircumflex'],
['ï', 'ï', true, 'idiaeresis'],
['ī', 'ī', true, 'imacron'],
['ð', 'ð', true, 'eth'],
['ñ', 'ñ', true, 'ntilde'],
['ò', 'ò', true, 'ograve'],
@ -198,12 +207,14 @@ var COMPONENTNAME = 'atto_charmap',
['õ', 'õ', true, 'otilde'],
['ö', 'ö', true, 'odiaeresis'],
['ø', 'ø', true, 'oslash'],
['ō', 'ō', true, 'omacron'],
['œ', 'œ', true, 'ligatureoe'],
['š', 'š', true, 'scaron'],
['ù', 'ù', true, 'ugrave'],
['ú', 'ú', true, 'uacute'],
['û', 'û', true, 'ucircumflex'],
['ü', 'ü', true, 'udiaeresis'],
['ū', 'ū', true, 'umacron'],
['ý', 'ý', true, 'yacute'],
['þ', 'þ', true, 'thorn'],
['ÿ', 'ÿ', true, 'ydiaeresis'],

4
lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js vendored
View File

File diff suppressed because one or more lines are too long

11
lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js vendored
View File

@ -48,6 +48,7 @@ var COMPONENTNAME = 'atto_charmap',
[' ', ' ', true, 'nobreakspace'],
['&', '&', true, 'ampersand'],
['"', '"', true, 'quotationmark'],
['‽', '‽', true, 'interrobang'],
// Finance.
['¢', '¢', true, 'centsign'],
['€', '€', true, 'eurosign'],
@ -147,16 +148,19 @@ var COMPONENTNAME = 'atto_charmap',
['Ã', 'Ã', true, 'atilde_caps'],
['Ä', 'Ä', true, 'adiaeresis_caps'],
['Å', 'Å', true, 'aringabove_caps'],
['Ā', 'Ā', true, 'amacron_caps'],
['Æ', 'Æ', true, 'ligatureae_caps'],
['Ç', 'Ç', true, 'ccedilla_caps'],
['È', 'È', true, 'egrave_caps'],
['É', 'É', true, 'eacute_caps'],
['Ê', 'Ê', true, 'ecircumflex_caps'],
['Ë', 'Ë', true, 'ediaeresis_caps'],
['Ē', 'Ē', true, 'emacron_caps'],
['Ì', 'Ì', true, 'igrave_caps'],
['Í', 'Í', true, 'iacute_caps'],
['Î', 'Î', true, 'icircumflex_caps'],
['Ï', 'Ï', true, 'idiaeresis_caps'],
['Ī', 'Ī', true, 'imacron_caps'],
['Ð', 'Ð', true, 'eth_caps'],
['Ñ', 'Ñ', true, 'ntilde_caps'],
['Ò', 'Ò', true, 'ograve_caps'],
@ -165,12 +169,14 @@ var COMPONENTNAME = 'atto_charmap',
['Õ', 'Õ', true, 'otilde_caps'],
['Ö', 'Ö', true, 'odiaeresis_caps'],
['Ø', 'Ø', true, 'oslash_caps'],
['Ō', 'Ō', true, 'omacron_caps'],
['Œ', 'Œ', true, 'ligatureoe_caps'],
['Š', 'Š', true, 'scaron_caps'],
['Ù', 'Ù', true, 'ugrave_caps'],
['Ú', 'Ú', true, 'uacute_caps'],
['Û', 'Û', true, 'ucircumflex_caps'],
['Ü', 'Ü', true, 'udiaeresis_caps'],
['Ū', 'Ū', true, 'umacron_caps'],
['Ý', 'Ý', true, 'yacute_caps'],
['Ÿ', 'Ÿ', true, 'ydiaeresis_caps'],
['Þ', 'Þ', true, 'thorn_caps'],
@ -180,16 +186,19 @@ var COMPONENTNAME = 'atto_charmap',
['ã', 'ã', true, 'atilde'],
['ä', 'ä', true, 'adiaeresis'],
['å', 'å', true, 'aringabove'],
['ā', 'ā', true, 'amacron'],
['æ', 'æ', true, 'ligatureae'],
['ç', 'ç', true, 'ccedilla'],
['è', 'è', true, 'egrave'],
['é', 'é', true, 'eacute'],
['ê', 'ê', true, 'ecircumflex'],
['ë', 'ë', true, 'ediaeresis'],
['ē', 'ē', true, 'emacron'],
['ì', 'ì', true, 'igrave'],
['í', 'í', true, 'iacute'],
['î', 'î', true, 'icircumflex'],
['ï', 'ï', true, 'idiaeresis'],
['ī', 'ī', true, 'imacron'],
['ð', 'ð', true, 'eth'],
['ñ', 'ñ', true, 'ntilde'],
['ò', 'ò', true, 'ograve'],
@ -198,12 +207,14 @@ var COMPONENTNAME = 'atto_charmap',
['õ', 'õ', true, 'otilde'],
['ö', 'ö', true, 'odiaeresis'],
['ø', 'ø', true, 'oslash'],
['ō', 'ō', true, 'omacron'],
['œ', 'œ', true, 'ligatureoe'],
['š', 'š', true, 'scaron'],
['ù', 'ù', true, 'ugrave'],
['ú', 'ú', true, 'uacute'],
['û', 'û', true, 'ucircumflex'],
['ü', 'ü', true, 'udiaeresis'],
['ū', 'ū', true, 'umacron'],
['ý', 'ý', true, 'yacute'],
['þ', 'þ', true, 'thorn'],
['ÿ', 'ÿ', true, 'ydiaeresis'],

11
lib/editor/atto/plugins/charmap/yui/src/button/js/button.js vendored
View File

@ -46,6 +46,7 @@ var COMPONENTNAME = 'atto_charmap',
[' ', ' ', true, 'nobreakspace'],
['&', '&', true, 'ampersand'],
['"', '"', true, 'quotationmark'],
['‽', '‽', true, 'interrobang'],
// Finance.
['¢', '¢', true, 'centsign'],
['€', '€', true, 'eurosign'],
@ -145,16 +146,19 @@ var COMPONENTNAME = 'atto_charmap',
['Ã', 'Ã', true, 'atilde_caps'],
['Ä', 'Ä', true, 'adiaeresis_caps'],
['Å', 'Å', true, 'aringabove_caps'],
['Ā', 'Ā', true, 'amacron_caps'],
['Æ', 'Æ', true, 'ligatureae_caps'],
['Ç', 'Ç', true, 'ccedilla_caps'],
['È', 'È', true, 'egrave_caps'],
['É', 'É', true, 'eacute_caps'],
['Ê', 'Ê', true, 'ecircumflex_caps'],
['Ë', 'Ë', true, 'ediaeresis_caps'],
['Ē', 'Ē', true, 'emacron_caps'],
['Ì', 'Ì', true, 'igrave_caps'],
['Í', 'Í', true, 'iacute_caps'],
['Î', 'Î', true, 'icircumflex_caps'],
['Ï', 'Ï', true, 'idiaeresis_caps'],
['Ī', 'Ī', true, 'imacron_caps'],
['Ð', 'Ð', true, 'eth_caps'],
['Ñ', 'Ñ', true, 'ntilde_caps'],
['Ò', 'Ò', true, 'ograve_caps'],
@ -163,12 +167,14 @@ var COMPONENTNAME = 'atto_charmap',
['Õ', 'Õ', true, 'otilde_caps'],
['Ö', 'Ö', true, 'odiaeresis_caps'],
['Ø', 'Ø', true, 'oslash_caps'],
['Ō', 'Ō', true, 'omacron_caps'],
['Œ', 'Œ', true, 'ligatureoe_caps'],
['Š', 'Š', true, 'scaron_caps'],
['Ù', 'Ù', true, 'ugrave_caps'],
['Ú', 'Ú', true, 'uacute_caps'],
['Û', 'Û', true, 'ucircumflex_caps'],
['Ü', 'Ü', true, 'udiaeresis_caps'],
['Ū', 'Ū', true, 'umacron_caps'],
['Ý', 'Ý', true, 'yacute_caps'],
['Ÿ', 'Ÿ', true, 'ydiaeresis_caps'],
['Þ', 'Þ', true, 'thorn_caps'],
@ -178,16 +184,19 @@ var COMPONENTNAME = 'atto_charmap',
['ã', 'ã', true, 'atilde'],
['ä', 'ä', true, 'adiaeresis'],
['å', 'å', true, 'aringabove'],
['ā', 'ā', true, 'amacron'],
['æ', 'æ', true, 'ligatureae'],
['ç', 'ç', true, 'ccedilla'],
['è', 'è', true, 'egrave'],
['é', 'é', true, 'eacute'],
['ê', 'ê', true, 'ecircumflex'],
['ë', 'ë', true, 'ediaeresis'],
['ē', 'ē', true, 'emacron'],
['ì', 'ì', true, 'igrave'],
['í', 'í', true, 'iacute'],
['î', 'î', true, 'icircumflex'],
['ï', 'ï', true, 'idiaeresis'],
['ī', 'ī', true, 'imacron'],
['ð', 'ð', true, 'eth'],
['ñ', 'ñ', true, 'ntilde'],
['ò', 'ò', true, 'ograve'],
@ -196,12 +205,14 @@ var COMPONENTNAME = 'atto_charmap',
['õ', 'õ', true, 'otilde'],
['ö', 'ö', true, 'odiaeresis'],
['ø', 'ø', true, 'oslash'],
['ō', 'ō', true, 'omacron'],
['œ', 'œ', true, 'ligatureoe'],
['š', 'š', true, 'scaron'],
['ù', 'ù', true, 'ugrave'],
['ú', 'ú', true, 'uacute'],
['û', 'û', true, 'ucircumflex'],
['ü', 'ü', true, 'udiaeresis'],
['ū', 'ū', true, 'umacron'],
['ý', 'ý', true, 'yacute'],
['þ', 'þ', true, 'thorn'],
['ÿ', 'ÿ', true, 'ydiaeresis'],