packages: wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec, wpmu-plugin...

glen glen at pld-linux.org
Mon May 17 13:10:28 CEST 2010


Author: glen                         Date: Mon May 17 11:10:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add localization patch and utf8 columns patch

---- Files affected:
packages/wpmu-plugin-blog-topics:
   wpmu-plugin-blog-topics.spec (1.3 -> 1.4) , localization.patch (NONE -> 1.1)  (NEW), utf8.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec
diff -u packages/wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec:1.3 packages/wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec:1.4
--- packages/wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec:1.3	Mon May 17 12:32:48 2010
+++ packages/wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec	Mon May 17 13:10:23 2010
@@ -3,13 +3,15 @@
 Summary:	WordPressMU Blog Topics Plugin
 Name:		wpmu-plugin-%{plugin}
 Version:	1.0
-Release:	0.2
+Release:	0.4
 License:	GPL v2+
 Group:		Applications/Publishing
 Source0:	http://downloads.wordpress.org/plugin/blog-topics.zip
 # Source0-md5:	3bb901ee63ce4c623e33b55c9f6b504b
 URL:		http://wordpress.org/extend/plugins/blog-topics/
 Patch0:		current_topic.patch
+Patch1:		localization.patch
+Patch2:		utf8.patch
 BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
@@ -32,6 +34,8 @@
 %setup -qn %{plugin}
 %undos readme.txt *.php
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/05/17 11:10:23  glen
+- add localization patch and utf8 columns patch
+
 Revision 1.3  2010/05/17 10:32:48  glen
 - show current topic
 

================================================================
Index: packages/wpmu-plugin-blog-topics/localization.patch
diff -u /dev/null packages/wpmu-plugin-blog-topics/localization.patch:1.1
--- /dev/null	Mon May 17 13:10:28 2010
+++ packages/wpmu-plugin-blog-topics/localization.patch	Mon May 17 13:10:23 2010
@@ -0,0 +1,52 @@
+--- blog-topics/cets_blogtopics.php~	2010-05-17 13:32:34.015516991 +0300
++++ blog-topics/cets_blogtopics.php	2010-05-17 13:30:07.699696433 +0300
+@@ -534,7 +534,7 @@
+     	}
+ 		
+     	$blog_topic = $this->get_blog_topic($id);
+-    	echo "<th>Blog Topic</th> <td><select name='blog_topic_id' id='blog_topic_id'>";
++    	echo "<th>",_e('Blog Topic'),"</th> <td><select name='blog_topic_id' id='blog_topic_id'>";
+ 		
+     	foreach ( $this->get_topics() as $topic )  {
+     		if ($blog_topic == $topic->id) {
+@@ -553,7 +553,7 @@
+ 	function get_topics_select_signup($id = 0)
+     {
+     	
+-    	echo "<label for='blog_topic_id'>Blog Topic:</label><select name='blog_topic_id' id='blog_topic_id'>";
++    	echo "<label for='blog_topic_id'>",_e('Blog Topic:'),"</label><select name='blog_topic_id' id='blog_topic_id'>";
+ 		
+     	foreach ( $this->get_topics() as $topic )  {
+ 			echo "<option value='$topic->id' " .">" . $topic->topic_name ."</option>";
+@@ -678,7 +678,7 @@
+     {
+     	global $wpdb;
+     	
+-    	echo "<table><tr><th>Topic ID</th><th valign='top'>Blog Topic:</th><th>Slug</th><th>Description<th>Edit/Add</th><th>Delete</th></tr>";
++    	echo "<table><tr><th>Topic ID</th><th valign='top'>",_e('Blog Topic:'),"</th><th>Slug</th><th>Description<th>Edit/Add</th><th>Delete</th></tr>";
+     	foreach ( $this->get_topics() as $topic )  {
+ 			
+     		echo "<tr><form name='catupdate' method='post'><td align='center'>" . $topic->id . "</td>";
+@@ -742,8 +742,8 @@
+         <div id="message" class="updated fade"><p><?php _e('Options saved.') ?></p></div>
+         <?php	} ?>
+         <div class="wrap">
+-        <h2>Blog Topic</h2>
+-        <p>Blog Topics are how <?php echo($sitename); ?> includes your posts into the topic areas on the main <?php echo($sitename); ?> site. These topics are for the convenience of the public using the main <?php echo($sitename); ?> site and do not affect your individual blog site in any way.<p> 
++        <h2><?php _e('Blog Topic') ?></h2>
++        <p><?php printf(_e('Blog Topics are how %$1s includes your posts into the topic areas on the main %$1s site. These topics are for the convenience of the public using the main %$1s site and do not affect your individual blog site in any way.'), $sitename) ?></p>
+         <form name="blogtopicform" action="" method="post">
+             <table class="form-table">	
+             <tr>
+@@ -751,9 +751,9 @@
+                     $this->get_topics_select();
+             ?>
+             <tr>
+-            <th scope="row">Blog Sharing Options</th>
++            <th scope="row"><?php _e('Blog Sharing Options') ?></th>
+             <td>
+             <fieldset>	
+-            <legend class="hidden">Blog Sharing Options</legend>
++            <legend class="hidden"><?php _e('Blog Sharing Options') ?></legend>
+             <label for="cets_topicexclude_no">
+             <input id="cets_topicexclude_no" type="radio" name="cets_topicexclude" value="0" <?php if( $excluded == 0 ) echo " checked"?> />

================================================================
Index: packages/wpmu-plugin-blog-topics/utf8.patch
diff -u /dev/null packages/wpmu-plugin-blog-topics/utf8.patch:1.1
--- /dev/null	Mon May 17 13:10:28 2010
+++ packages/wpmu-plugin-blog-topics/utf8.patch	Mon May 17 13:10:23 2010
@@ -0,0 +1,11 @@
+--- blog-topics/cets_blogtopics.php~	2010-05-17 13:41:20.000000000 +0300
++++ blog-topics/cets_blogtopics.php	2010-05-17 14:06:53.925099344 +0300
+@@ -104,7 +104,7 @@
+ 							  banner VARCHAR(200) NOT NULL default '',
+ 							  featured Integer default 0,
+ 						      UNIQUE KEY id (id)
+-						      )";	  
++						      ) CHARACTER SET utf8 COLLATE utf8_general_ci";
+  			
+  			$results = $wpdb->query($table_topic_query);
+ 			
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu-plugin-blog-topics/wpmu-plugin-blog-topics.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list