Index: typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (copie de travail)
@@ -82,7 +82,7 @@
* LOCALIZATION *
***************************************************/
localize: function (label) {
- return HTMLArea.I18N.dialogs[label] || HTMLArea.I18N.tooltips[label] || HTMLArea.I18N.msg[label] || label;
+ return HTMLArea.I18N.dialogs[label] || HTMLArea.I18N.tooltips[label] || HTMLArea.I18N.msg[label] || '';
},
/***************************************************
* INITIALIZATION *
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js (copie de travail)
@@ -178,6 +178,7 @@
tooltip : this.localize(buttonId + '-Tooltip'),
iconCls : 'htmlarea-action-' + button[3],
contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
+ helpText : this.localize(buttonId + '-helpText'),
action : 'onButtonPress',
hotKey : ((this.buttonsConfiguration[button[2]] && this.buttonsConfiguration[button[2]].hotKey) ? this.buttonsConfiguration[button[2]].hotKey : (button[1] ? button[1] : null))
};
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/locallang.xml (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/locallang.xml (copie de travail)
@@ -8,21 +8,33 @@
+
+
+
+
+
-
+
+
+
+
+
+
+
+
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js (copie de travail)
@@ -125,9 +125,9 @@
itemId: itemId,
cls: 'button',
overCls: 'hover',
- text: (button.contextMenuTitle || button.tooltip.title),
+ text: (button.contextMenuTitle ? button.contextMenuTitle : button.tooltip.title),
iconCls: button.iconCls,
- helpText: this.localize(itemId + '-helpText') || this.localize(itemId + '-tooltip'),
+ helpText: (button.helpText ? button.helpText : this.localize(itemId + '-tooltip')),
hidden: true
});
firstInGroup = false;
@@ -201,7 +201,8 @@
} else if (xtype === 'menuitem') {
var button = this.getButton(menuItem.getItemId());
if (button) {
- menuItem.setText(button.tooltip.title);
+ menuItem.setText(button.contextMenuTitle ? button.contextMenuTitle : button.tooltip.title);
+ menuItem.helpText = button.helpText ? button.helpText : menuItem.helpText;
menuItem.setVisible(!button.disabled);
lastIsButton = lastIsButton || !button.disabled;
} else {
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/locallang.xml (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/locallang.xml (copie de travail)
@@ -6,6 +6,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -32,6 +65,11 @@
+
+
+
+
+
@@ -41,42 +79,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js (copie de travail)
@@ -75,6 +75,8 @@
var buttonConfiguration = {
id : buttonId,
tooltip : this.localize(buttonId + '-Tooltip'),
+ contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
+ helpText : this.localize(buttonId + '-helpText'),
iconCls : 'htmlarea-action-' + button[5],
action : 'onButtonPress',
context : button[1],
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/locallang.xml (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/locallang.xml (copie de travail)
@@ -8,9 +8,13 @@
+
+
+
+
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js (copie de travail)
@@ -106,6 +106,8 @@
var buttonConfiguration = {
id : buttonId,
tooltip : this.localize(buttonId + "-Tooltip"),
+ contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
+ helpText : this.localize(buttonId + '-helpText'),
action : "onButtonPress",
context : button[1],
hide : false,
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/locallang.xml (révision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/locallang.xml (copie de travail)
@@ -15,15 +15,19 @@
+
+
+
+
@@ -32,6 +36,7 @@
+