[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.34,1.35 serendipity_lang_en.inc.php,1.48,1.49

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17760

Modified Files:
	serendipity_sidebar_items.php serendipity_lang_en.inc.php 
Log Message:
Change the wording and doing of the "Perform Markup Transformations..." to make more sense to the common user


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_sidebar_items.php	6 Jan 2004 10:11:45 -0000	1.34
+++ serendipity_sidebar_items.php	6 Jan 2004 22:01:52 -0000	1.35
@@ -393,8 +393,8 @@
             
             case 'markup':
                 $propbag->add('type',        'boolean');
-                $propbag->add('name',        NO_MARKUP);
-                $propbag->add('description', NO_MARKUP_DESCRIPTION);
+                $propbag->add('name',        DO_MARKUP);
+                $propbag->add('description', DO_MARKUP_DESCRIPTION);
                 break;
 
             default:
@@ -406,10 +406,10 @@
     function generate_content(&$title)
     {
         $title = $this->get_config('title', $title);
-        if ($this->get_config('markup') == 'true') {
-            echo $this->get_config('content');
-        } else {
+        if ($this->get_config('markup') == 'true' || $this->get_config('markup') == '') {
             echo serendipity_markup_text($this->get_config('content'));
+        } else {
+            echo $this->get_config('content');
         }
     }
 }

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_en.inc.php	4 Jan 2004 01:06:05 -0000	1.48
+++ serendipity_lang_en.inc.php	6 Jan 2004 22:01:52 -0000	1.49
@@ -298,7 +298,7 @@
 @define('PREVIOUS_PAGE', 'previous page');
 @define('NEXT_PAGE', 'next page');
 @define('ALL_CATEGORIES', 'All categories');
-@define('NO_MARKUP', 'No markup transformations');
-@define('NO_MARKUP_DESCRIPTION', 'Do not apply any markup transformations to this text (like smilies, shortcut markups via *, /, _, ...). This will preserve any HTML-code you have typed');
+@define('DO_MARKUP', 'Perform Markup Transformations');
+@define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text. Default is "Yes".');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>