summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWiktor Walc2008-11-19 11:53:34 (GMT)
committer Wiktor Walc2008-11-19 11:53:34 (GMT)
commitc5aee2d40f8ac937913afe15835f6c60195d53f8 (patch)
tree8fa1c9533cce3d9c8f85add21b1bb6b7cf301fd0
parent51d5a59e8969b14685acff033037abbe5415bad0 (diff)
Fixed: #322939 Distinguish between Teaser and page break
-rw-r--r--CHANGELOG.txt1
-rw-r--r--fckeditor.config.js4
-rw-r--r--plugins/drupalbreak/fckplugin.js2
-rw-r--r--plugins/drupalbreak/lang/en.js3
-rw-r--r--plugins/drupalbreak/lang/pl.js2
-rw-r--r--plugins/drupalpagebreak/fckplugin.js2
-rw-r--r--plugins/drupalpagebreak/lang/en.js3
-rw-r--r--plugins/drupalpagebreak/lang/pl.js2
8 files changed, 13 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b3159d0..27efb49 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@ $Id$
-- 2008-11-19 version 5.x-2.x-dev
* #334947 Added LoginToboggan administration pages to the default exclusion list
+* #322939 Fixed: Distinguish between Teaser and page break
-- 2008-11-14 version 5.x-2.x-dev
* #332727 Fixed: Fatal php error in PHP4
diff --git a/fckeditor.config.js b/fckeditor.config.js
index 055a253..355d77c 100644
--- a/fckeditor.config.js
+++ b/fckeditor.config.js
@@ -33,8 +33,8 @@ FCKConfig.PluginsPath = '../../plugins/' ;
FCKConfig.Plugins.Add( 'imgassist' ) ;
//FCKConfig.Plugins.Add( 'linktonode', 'en,pl' ) ;
//FCKConfig.Plugins.Add( 'linktomenu', 'en,pl' ) ;
-//FCKConfig.Plugins.Add( 'drupalbreak' ) ;
-//FCKConfig.Plugins.Add( 'drupalpagebreak' ) ;
+//FCKConfig.Plugins.Add( 'drupalbreak', 'en,pl' ) ;
+//FCKConfig.Plugins.Add( 'drupalpagebreak', 'en,pl' ) ;
/*
This toolbar is dedicated to users with "Full HTML" access
diff --git a/plugins/drupalbreak/fckplugin.js b/plugins/drupalbreak/fckplugin.js
index 606c60e..252b744 100644
--- a/plugins/drupalbreak/fckplugin.js
+++ b/plugins/drupalbreak/fckplugin.js
@@ -138,7 +138,7 @@ FCKDrupalBreak.prototype.GetState = function()
// Register the Drupal tag commands.
FCKCommands.RegisterCommand( 'DrupalBreak', new FCKDrupalBreak( 'Break' ) ) ;
// Create the Drupal tag buttons.
-var oDrupalItem = new FCKToolbarButton( 'DrupalBreak', 'Break', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
+var oDrupalItem = new FCKToolbarButton( 'DrupalBreak', FCKLang.DrupalBreakTitle, FCKLang.DrupalBreakTooltip, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
oDrupalItem.IconPath = FCKConfig.PluginsPath + 'drupalbreak/drupalbreak.gif';
FCKToolbarItems.RegisterItem( 'DrupalBreak', oDrupalItem ) ;
diff --git a/plugins/drupalbreak/lang/en.js b/plugins/drupalbreak/lang/en.js
index a21c533..3a9cc4a 100644
--- a/plugins/drupalbreak/lang/en.js
+++ b/plugins/drupalbreak/lang/en.js
@@ -1 +1,2 @@
-FCKLang.DrupalBreakTitle = 'Insert Teaser Break' ;
+FCKLang.DrupalBreakTooltip = 'Insert Teaser Break' ;
+FCKLang.DrupalBreakTitle = 'Teaser' ;
diff --git a/plugins/drupalbreak/lang/pl.js b/plugins/drupalbreak/lang/pl.js
new file mode 100644
index 0000000..ed67702
--- /dev/null
+++ b/plugins/drupalbreak/lang/pl.js
@@ -0,0 +1,2 @@
+FCKLang.DrupalBreakTooltip = 'Wstaw znacznik oznaczający koniec skrótu' ;
+FCKLang.DrupalBreakTitle = 'Skrót' ;
diff --git a/plugins/drupalpagebreak/fckplugin.js b/plugins/drupalpagebreak/fckplugin.js
index 48f06ba..e238054 100644
--- a/plugins/drupalpagebreak/fckplugin.js
+++ b/plugins/drupalpagebreak/fckplugin.js
@@ -121,7 +121,7 @@ FCKDrupalPageBreak.prototype.GetState = function()
// Register the Drupal tag commands.
FCKCommands.RegisterCommand( 'DrupalPageBreak', new FCKDrupalPageBreak( 'Break' ) ) ;
// Create the Drupal tag buttons.
-var oDrupalItem = new FCKToolbarButton( 'DrupalPageBreak', 'Break', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
+var oDrupalItem = new FCKToolbarButton( 'DrupalPageBreak', FCKLang.DrupalPageBreakTitle, FCKLang.DrupalPageBreakTooltip, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
oDrupalItem.IconPath = FCKConfig.PluginsPath + 'drupalpagebreak/drupalpagebreak.gif';
FCKToolbarItems.RegisterItem( 'DrupalPageBreak', oDrupalItem ) ;
diff --git a/plugins/drupalpagebreak/lang/en.js b/plugins/drupalpagebreak/lang/en.js
index a21c533..0f47493 100644
--- a/plugins/drupalpagebreak/lang/en.js
+++ b/plugins/drupalpagebreak/lang/en.js
@@ -1 +1,2 @@
-FCKLang.DrupalBreakTitle = 'Insert Teaser Break' ;
+FCKLang.DrupalPageBreakTooltip = 'Insert Page Break' ;
+FCKLang.DrupalPageBreakTitle = 'Page' ;
diff --git a/plugins/drupalpagebreak/lang/pl.js b/plugins/drupalpagebreak/lang/pl.js
new file mode 100644
index 0000000..b006c87
--- /dev/null
+++ b/plugins/drupalpagebreak/lang/pl.js
@@ -0,0 +1,2 @@
+FCKLang.DrupalPageBreakTooltip = 'Wstaw znacznik nowej strony' ;
+FCKLang.DrupalPageBreakTitle = 'Strona' ;