Changeset 324:07f1d829b183

Timestamp:

06/01/11 15:54:48 (14 years ago)

Author:

xave <xave@…>

Branch:

2.3

Message:

Favourites are now internally handled in English and translated
only when displayed.

Files:

• admin/preferences.php (modified) (3 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (1 diff)
• plugins/antispam/_admin.php (modified) (1 diff)
• plugins/blogroll/_admin.php (modified) (1 diff)
• plugins/importExport/_admin.php (modified) (1 diff)
• plugins/maintenance/_admin.php (modified) (1 diff)
• plugins/pages/_admin.php (modified) (1 diff)
• plugins/pings/_admin.php (modified) (1 diff)
• plugins/tags/_admin.php (modified) (1 diff)
• plugins/widgets/_admin.php (modified) (1 diff)

admin/preferences.php

@@ -499 +499 @@
                     form::field(array('order['.$k.']'),2,3,$count,'position','',false,'title="'.sprintf(__('position of %s'),$fav['title']).'"').
                     form::hidden(array('dynorder[]','dynorder-'.$k.''),$k).
-                    '<label for="fuk-'.$k.'">'.form::checkbox(array('remove[]','fuk-'.$k),$k).$fav['title'].'</label>'.
+                    '<label for="fuk-'.$k.'">'.form::checkbox(array('remove[]','fuk-'.$k),$k).__($fav['title']).'</label>'.
                     '</li>';
           }
@@ -542 +542 @@
                $count++;
                echo '<li id="fd-'.$k.'">'.
-               '<img src="'.$fav['small-icon'].'" alt="" /> '.$fav['title'].'</li>';
+               '<img src="'.$fav['small-icon'].'" alt="" /> '.__($fav['title']).'</li>';
           }
      }
@@ -568 +568 @@
           echo '<li id="fa-'.$fav[0].'">'.'<label for="fak-'.$fav[0].'">'.
                form::checkbox(array('append[]','fak-'.$fav[0]),$k).
-               '<img src="'.$fav[3].'" alt="" /> '.'<span class="zoom"><img src="'.$fav[4].'" alt="" /></span>'.$fav[1].
-               '</label>'.'</li>';
+               '<img src="'.$fav[3].'" alt="" /> '.'<span class="zoom"><img src="'.$fav[4].'" alt="" /></span>'.
+               __($fav[1]).'</label>'.'</li>';
      }
 }    

inc/admin/prepend.php

@@ -185 +185 @@
      # NB : '*' in permissions means any, null means super admin only
      
-     $_fav['prefs'] = new ArrayObject(array('prefs',__('My preferences'),'preferences.php',
+     $_fav['prefs'] = new ArrayObject(array('prefs','My preferences','preferences.php',
           'images/menu/user-pref.png','images/menu/user-pref-b.png',
           '*',null,null));
 
-     $_fav['new_post'] = new ArrayObject(array('new_post',__('New entry'),'post.php',
+     $_fav['new_post'] = new ArrayObject(array('new_post','New entry','post.php',
           'images/menu/edit.png','images/menu/edit-b.png',
           'usage,contentadmin',null,'menu-new-post'));
-     $_fav['posts'] = new ArrayObject(array('posts',__('Entries'),'posts.php',
+     $_fav['posts'] = new ArrayObject(array('posts','Entries','posts.php',
           'images/menu/entries.png','images/menu/entries-b.png',
           'usage,contentadmin',null,null));
-     $_fav['comments'] = new ArrayObject(array('comments',__('Comments'),'comments.php',
+     $_fav['comments'] = new ArrayObject(array('comments','Comments','comments.php',
           'images/menu/comments.png','images/menu/comments-b.png',
           'usage,contentadmin',null,null));
-     $_fav['search'] = new ArrayObject(array('search',__('Search'),'search.php',
+     $_fav['search'] = new ArrayObject(array('search','Search','search.php',
           'images/menu/search.png','images/menu/search-b.png',
           'usage,contentadmin',null,null));
-     $_fav['categories'] = new ArrayObject(array('categories',__('Categories'),'categories.php',
+     $_fav['categories'] = new ArrayObject(array('categories','Categories','categories.php',
           'images/menu/categories.png','images/menu/categories-b.png',
           'categories',null,null));
-     $_fav['media'] = new ArrayObject(array('media',__('Media manager'),'media.php',
+     $_fav['media'] = new ArrayObject(array('media','Media manager','media.php',
           'images/menu/media.png','images/menu/media-b.png',
           'media,media_admin',null,null));
-     $_fav['blog_pref'] = new ArrayObject(array('blog_pref',__('Blog settings'),'blog_pref.php',
+     $_fav['blog_pref'] = new ArrayObject(array('blog_pref','Blog settings','blog_pref.php',
           'images/menu/blog-pref.png','images/menu/blog-pref-b.png',
           'admin',null,null));
-     $_fav['blog_theme'] = new ArrayObject(array('blog_theme',__('Blog appearance'),'blog_theme.php',
+     $_fav['blog_theme'] = new ArrayObject(array('blog_theme','Blog appearance','blog_theme.php',
           'images/menu/themes.png','images/menu/blog-theme-b.png',
           'admin',null,null));
 
-     $_fav['blogs'] = new ArrayObject(array('blogs',__('Blogs'),'blogs.php',
+     $_fav['blogs'] = new ArrayObject(array('blogs','Blogs','blogs.php',
           'images/menu/blogs.png','images/menu/blogs-b.png',
           'usage,contentadmin',null,null));
-     $_fav['users'] = new ArrayObject(array('users',__('Users'),'users.php',
+     $_fav['users'] = new ArrayObject(array('users','Users','users.php',
           'images/menu/users.png','images/menu/users-b.png',
           null,null,null));
-     $_fav['plugins'] = new ArrayObject(array('plugins',__('Plugins'),'plugins.php',
+     $_fav['plugins'] = new ArrayObject(array('plugins','Plugins','plugins.php',
           'images/menu/plugins.png','images/menu/plugins-b.png',
           null,null,null));
-     $_fav['langs'] = new ArrayObject(array('langs',__('Languages'),'langs.php',
+     $_fav['langs'] = new ArrayObject(array('langs','Languages','langs.php',
           'images/menu/langs.png','images/menu/langs-b.png',
           null,null,null));

inc/dbschema/upgrade.php

@@ -149 +149 @@
                     $init_fav = array();
 
-                    $init_fav['new_post'] = array('new_post',__('New entry'),'post.php',
+                    $init_fav['new_post'] = array('new_post','New entry','post.php',
                          'images/menu/edit.png','images/menu/edit-b.png',
                          'usage,contentadmin',null,'menu-new-post');
-                    $init_fav['posts'] = array('posts',__('Entries'),'posts.php',
+                    $init_fav['posts'] = array('posts','Entries','posts.php',
                          'images/menu/entries.png','images/menu/entries-b.png',
                          'usage,contentadmin',null,null);
-                    $init_fav['comments'] = array('comments',__('Comments'),'comments.php',
+                    $init_fav['comments'] = array('comments','Comments','comments.php',
                          'images/menu/comments.png','images/menu/comments-b.png',
                          'usage,contentadmin',null,null);
-                    $init_fav['prefs'] = array('prefs',__('My preferences'),'preferences.php',
+                    $init_fav['prefs'] = array('prefs','My preferences','preferences.php',
                          'images/menu/user-pref.png','images/menu/user-pref-b.png',
                          '*',null,null);
-                    $init_fav['blog_pref'] = array('blog_pref',__('Blog settings'),'blog_pref.php',
+                    $init_fav['blog_pref'] = array('blog_pref','Blog settings','blog_pref.php',
                          'images/menu/blog-pref.png','images/menu/blog-pref-b.png',
                          'admin',null,null);
-                    $init_fav['blog_theme'] = array('blog_theme',__('Blog appearance'),'blog_theme.php',
+                    $init_fav['blog_theme'] = array('blog_theme','Blog appearance','blog_theme.php',
                          'images/menu/themes.png','images/menu/blog-theme-b.png',
                          'admin',null,null);
 
-                    $init_fav['pages'] = array('pages',__('Pages'),'plugin.php?p=pages',
+                    $init_fav['pages'] = array('pages','Pages','plugin.php?p=pages',
                          'index.php?pf=pages/icon.png','index.php?pf=pages/icon-big.png',
                          'contentadmin,pages',null,null);
-                    $init_fav['blogroll'] = array('blogroll',__('Blogroll'),'plugin.php?p=blogroll',
+                    $init_fav['blogroll'] = array('blogroll','Blogroll','plugin.php?p=blogroll',
                          'index.php?pf=blogroll/icon-small.png','index.php?pf=blogroll/icon.png',
                          'usage,contentadmin',null,null);

plugins/antispam/_admin.php

@@ -29 +29 @@
 function antispamDashboardFavs($core,$favs)
 {
-     $favs['antispam'] = new ArrayObject(array('antispam',__('Antispam'),'plugin.php?p=antispam',
+     $favs['antispam'] = new ArrayObject(array('antispam','Antispam','plugin.php?p=antispam',
           'index.php?pf=antispam/icon.png','index.php?pf=antispam/icon-big.png',
           'admin',null,null));

plugins/blogroll/_admin.php

@@ -20 +20 @@
 function blogroll_dashboard_favs($core,$favs)
 {
-     $favs['blogroll'] = new ArrayObject(array('blogroll',__('Blogroll'),'plugin.php?p=blogroll',
+     $favs['blogroll'] = new ArrayObject(array('blogroll','Blogroll','plugin.php?p=blogroll',
           'index.php?pf=blogroll/icon-small.png','index.php?pf=blogroll/icon.png',
           'usage,contentadmin',null,null));

plugins/importExport/_admin.php

@@ -25 +25 @@
 function importExportDashboardFavs($core,$favs)
 {
-     $favs['importExport'] = new ArrayObject(array('importExport',__('Import/Export'),'plugin.php?p=importExport',
+     $favs['importExport'] = new ArrayObject(array('importExport','Import/Export','plugin.php?p=importExport',
           'index.php?pf=importExport/icon.png','index.php?pf=importExport/icon-big.png',
           'admin',null,null));

plugins/maintenance/_admin.php

@@ -20 +20 @@
 function maintenanceDashboardFavs($core,$favs)
 {
-     $favs['maintenance'] = new ArrayObject(array('maintenance',__('Maintenance'),'plugin.php?p=maintenance',
+     $favs['maintenance'] = new ArrayObject(array('maintenance','Maintenance','plugin.php?p=maintenance',
           'index.php?pf=maintenance/icon.png','index.php?pf=maintenance/icon-big.png',
           null,null,null));

plugins/pages/_admin.php

@@ -21 +21 @@
 function pages_dashboard_favs($core,$favs)
 {
-     $favs['pages'] = new ArrayObject(array('pages',__('Pages'),'plugin.php?p=pages',
+     $favs['pages'] = new ArrayObject(array('pages','Pages','plugin.php?p=pages',
           'index.php?pf=pages/icon.png','index.php?pf=pages/icon-big.png',
           'contentadmin,pages',null,null));
-     $favs['newpage'] = new ArrayObject(array('newpage',__('New page'),'plugin.php?p=pages&act=page',
+     $favs['newpage'] = new ArrayObject(array('newpage','New page','plugin.php?p=pages&act=page',
           'index.php?pf=pages/icon-np.png','index.php?pf=pages/icon-np-big.png',
           'contentadmin,pages',null,null));

plugins/pings/_admin.php

@@ -41 +41 @@
 function pingDashboardFavs($core,$favs)
 {
-     $favs['pings'] = new ArrayObject(array('pings',__('Pings'),'plugin.php?p=pings',
+     $favs['pings'] = new ArrayObject(array('pings','Pings','plugin.php?p=pings',
           'index.php?pf=pings/icon.png','index.php?pf=pings/icon-big.png',
           null,null,null));

plugins/tags/_admin.php

@@ -45 +45 @@
      public static function dashboardFavs($core,$favs)
      {
-          $favs['tags'] = new ArrayObject(array('tags',__('Tags'),'plugin.php?p=tags&m=tags',
+          $favs['tags'] = new ArrayObject(array('tags','Tags','plugin.php?p=tags&m=tags',
                'index.php?pf=tags/icon.png','index.php?pf=tags/icon-big.png',
                'usage,contentadmin',null,null));

plugins/widgets/_admin.php

@@ -16 +16 @@
 function widgets_dashboard_favs($core,$favs)
 {
-     $favs['widgets'] = new ArrayObject(array('widgets',__('Presentation widgets'),'plugin.php?p=widgets',
+     $favs['widgets'] = new ArrayObject(array('widgets','Presentation widgets','plugin.php?p=widgets',
           'index.php?pf=widgets/icon.png','index.php?pf=widgets/icon-big.png',
           'admin',null,null));