Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Ingo Schommer 2012-08-13 00:47:47 +02:00
commit 5bfaa65719
7 changed files with 89 additions and 1 deletions

View File

@ -925,6 +925,7 @@ class i18n extends Object implements TemplateGlobalProvider {
'ko_KP' => 'ko', 'ko_KP' => 'ko',
'ko_KR' => 'ko', 'ko_KR' => 'ko',
'ko_CN' => 'ko', 'ko_CN' => 'ko',
'mi_NZ' => 'mi_NZ',
'nb_NO' => 'nb', 'nb_NO' => 'nb',
'nb_SJ' => 'nb', 'nb_SJ' => 'nb',
'nl_AN' => 'nl', 'nl_AN' => 'nl',

View File

@ -129,6 +129,8 @@ en:
VALIDDATEFORMAT2: 'Please enter a valid date format ({format})' VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})' VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})' VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
DatetimeField:
NOTSET: 'Not set'
Director: Director:
INVALID_REQUEST: 'Invalid request' INVALID_REQUEST: 'Invalid request'
DropdownField: DropdownField:

0
thirdparty/tinymce/langs/mi_NZ.js vendored Normal file
View File

View File

@ -0,0 +1,76 @@
tinyMCE.addI18n('mi_NZ.advanced', {
"underline_desc": "Underline (Ctrl+U)",
"italic_desc": "Italic (Ctrl+I)",
"bold_desc": "Bold (Ctrl+B)",
dd: "Definition Description",
dt: "Definition Term ",
samp: "Code Sample",
code: "Code",
blockquote: "Block Quote",
h6: "Panek\u014Drero 6",
h5: "Panek\u014Drero 5",
h4: "Panek\u014Drero 4",
h3: "Panek\u014Drero 3",
h2: "Panek\u014Drero 2",
h1: "Panek\u014Drero 1",
pre: "Kua whakah\u014Dpututia i mua",
address: "W\u0101hitau",
div: "DIV",
paragraph: "K\u014Dwae",
block: "H\u014Dputu",
fontdefault: "Font Family",
"font_size": "Font Size",
"style_select": "Ng\u0101 K\u0101hua",
"anchor_delta_height": "",
"anchor_delta_width": "",
"charmap_delta_height": "",
"charmap_delta_width": "",
"colorpicker_delta_height": "",
"colorpicker_delta_width": "",
"link_delta_height": "",
"link_delta_width": "",
"image_delta_height": "",
"image_delta_width": "",
"more_colors": "More Colors...",
"toolbar_focus": "Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
newdocument: "Are you sure you want clear all contents?",
path: "Path",
"clipboard_msg": "Copy/Cut/Paste is not available in Mozilla and Firefox. Do you want more information about this issue?",
"blockquote_desc": "Block Quote",
"help_desc": "Help",
"newdocument_desc": "New Document",
"image_props_desc": "Image Properties",
"paste_desc": "Paste (Ctrl+V)",
"copy_desc": "Copy (Ctrl+C)",
"cut_desc": "Cut (Ctrl+X)",
"anchor_desc": "Insert/Edit Anchor",
"visualaid_desc": "show/Hide Guidelines/Invisible Elements",
"charmap_desc": "Insert Special Character",
"backcolor_desc": "Select Background Color",
"forecolor_desc": "Select Text Color",
"custom1_desc": "Your Custom Description Here",
"removeformat_desc": "Remove Formatting",
"hr_desc": "Insert Horizontal Line",
"sup_desc": "Superscript",
"sub_desc": "Subscript",
"code_desc": "Edit HTML Source",
"cleanup_desc": "Cleanup Messy Code",
"image_desc": "Insert/Edit Image",
"unlink_desc": "Unlink",
"link_desc": "Insert/Edit Link",
"redo_desc": "Redo (Ctrl+Y)",
"undo_desc": "Undo (Ctrl+Z)",
"indent_desc": "Increase Indent",
"outdent_desc": "Decrease Indent",
"numlist_desc": "Insert/Remove Numbered List",
"bullist_desc": "Insert/Remove Bulleted List",
"justifyfull_desc": "Align Full",
"justifyright_desc": "Align Right",
"justifycenter_desc": "Align Center",
"justifyleft_desc": "Align Left",
"striketrough_desc": "Strikethrough",
"help_shortcut": "Press ALT-F10 for toolbar. Press ALT-0 for help",
"rich_text_area": "Rich Text Area",
"shortcuts_desc": "Accessability Help",
toolbar: "Toolbar"
});

View File

@ -1,6 +1,13 @@
(function() { (function() {
var each = tinymce.each; var each = tinymce.each;
// TinyMCE will stop loading if it encounters non-existent external script file
// when included through tiny_mce_gzip.php. Only load the external lang package if it is available.
var availableLangs = ['en', 'mi_NZ'];
if(jQuery.inArray(tinymce.settings.language, availableLangs) != -1) {
tinymce.PluginManager.requireLangPack("ssmacron");
}
/** /**
* Load via: * Load via:
* HtmlEditorConfig::get('cms')->enablePlugins(array('ssmacron', '../tinymce_ssmacron')) * HtmlEditorConfig::get('cms')->enablePlugins(array('ssmacron', '../tinymce_ssmacron'))
@ -33,7 +40,7 @@
// Register buttons // Register buttons
ed.addButton('ssmacron', { ed.addButton('ssmacron', {
title : 'Insert a Macron', title : t.editor.translate('insertmacron'),
cmd : 'mceInsertMacron', cmd : 'mceInsertMacron',
image : url + '/img/macron.png' image : url + '/img/macron.png'
}); });

View File

@ -0,0 +1 @@
tinyMCE.addI18n('en.ssmacron',{'insertmacron': 'Insert a Macron'});

View File

@ -0,0 +1 @@
tinyMCE.addI18n('mi_NZ.ssmacron',{'insertmacron': 'T\u0101urua he tohut\u014D'});