Changeset 499

Timestamp:

08/13/06 19:14:05 (2 years ago)

Author:

misja

Message:

Changed use of a_hrefg to a_href and have the strings translated in function and not via intermediate function. Seems more logical and will ease gettext string extraction instead of using --keyword switch etc.

Files:

• devel/lib/templates.php (modified) (5 diffs)
• devel/mod/community/lib.php (modified) (3 diffs)
• devel/mod/file/lib.php (modified) (1 diff)
• devel/mod/friend/lib.php (modified) (1 diff)
• devel/mod/newsclient/lib.php (modified) (1 diff)
• devel/mod/template/lib.php (modified) (1 diff)

devel/lib/templates.php

@@ -457 +457 @@
-    if (isadmin()) {
-    $PAGE->menu_top [] = array( 'name' => 'admin',
-g
+
-                                //                "Administration"));
-                                'html' => "<li><a href=\"" . $CFG->wwwroot . "_admin/\">" . gettext("Administration") . "</a></li>");
@@ -464 +464 @@
-    $PAGE->menu_top[] = array(
-                              'name' => 'userdetails',
-g
+
-                              //                  "Account settings"));
-                              'html' => "<li><a href=\"" . $CFG->wwwroot . "_userdetails/\">" . gettext("Account settings") . "</a></li>");
@@ -470 +470 @@
-    $PAGE->menu_top[] = array(
-                              'name' => 'logoff',
-g
+
-                              //                 "Log off"));
-                              'html' => "<li><a href=\"" . $CFG->wwwroot . "login/logout.php\">" . gettext("Log off") . "</a></li>");
@@ -477 +477 @@
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'user:edit',
-g
-"Edit user details"
+
+gettext("Edit user details")
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'user:icon',
-g
-"Your site picture"
+
+gettext("Your site picture")
-    }
-
@@ -488 +488 @@
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'admin',
-g
-"Main"
+
+gettext("Main")
-   
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'admin:useradd',
-g
-"Add users"
+
+gettext("Add users")
-
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'admin:users',
-g
-"Manage users"
+
+gettext("Manage users")
-
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'admin:flaggedcontent',
-g
-"Manage flagged content"
+
+gettext("Manage flagged content")
-   
-        $PAGE->menu_sub[] = array(
-                                  'name' => 'admin:spam',
-g
-"Spam control"
+
+gettext("Spam control")
-            
-    }

devel/mod/community/lib.php

@@ -22 +22 @@
-            
-                $PAGE->menu_sub[] = array( 'name' => 'community:pic',
-g
+
-                                                              gettext("Community site picture")));
-    
-                $PAGE->menu_sub[] = array( 'name' => 'community:edit',
-g
+
-                                                             gettext("Edit community details")));
-
@@ -34 +34 @@
-        if (defined("context") && (context == "profile" || context == "network")) {
-            $PAGE->menu_sub[] = array( 'name' => 'community:requests',
-g
+
-                                                             gettext("View membership requests")));
-        }
-        
-        /*$PAGE->menu_sub[] = array( 'name' => 'community:members',
-g
+
-                                                      gettext("Community Members")));*/
-                                                      
@@ -48 +48 @@
-    
-            $PAGE->menu_sub[] = array( 'name' => 'community',
-g
+
-                                                          gettext("Communities"))); 
-                            
-            $PAGE->menu_sub[] = array( 'name' => 'community:owned',
-g
+
-                                                          gettext("Owned Communities")));
-

devel/mod/file/lib.php

@@ -25 +25 @@
-        if ($page_owner == $_SESSION['userid'] && $page_owner != -1) {
-            $PAGE->menu_sub[] = array( 'name' => 'file:add',
-g
- 
+
+
-        }
-        if ($page_owner != -1) {
-            if ($page_owner == $_SESSION['userid'] && $page_owner != -1) {
-                $PAGE->menu_sub[] = array( 'name' => 'file:rss',
-g
+
-                                                              gettext("RSS feed for files")));  
-            }
-            if ($page_owner == $_SESSION['userid'] && $page_owner != -1) {
-                $PAGE->menu_sub[] = array( 'name' => 'file:help',
-g
+
-                                                              gettext("Page help")));  
-            }

devel/mod/friend/lib.php

@@ -27 +27 @@
-            
-            $PAGE->menu_sub[] = array( 'name' => 'friend',
-g
+
-                                                          gettext("Friends"))); 
-            
-            $PAGE->menu_sub[] = array( 'name' => 'friend:of',
-g
+
-                                                          gettext("Friend of"))); 
-
-            $PAGE->menu_sub[] = array( 'name' => 'friend:requests',
-g
+
-                                                          gettext("Friendship requests")));
-            
-            $PAGE->menu_sub[] = array( 'name' => 'friend:foaf',
-g
+
-                                                          gettext("FOAF"))); 
-
-            if (isloggedin()) {
-                $PAGE->menu_sub[] = array( 'name' => 'friend:accesscontrols',
-g
+
-                                                              gettext("Access controls")));
-
-                if ($CFG->publicinvite == true) {
-                    $PAGE->menu_sub[] = array( 'name' => 'friend:invite',
-g
+
-                                                                  gettext("Invite a friend"))); 
-                }
-                
-                $PAGE->menu_sub[] = array( 'name' => 'friend:help',
-g
+
-                                                              gettext("Page help")));
-                

devel/mod/newsclient/lib.php

@@ -26 +26 @@
-            if (run("permissions:check", "rss") && logged_on && $page_owner == $_SESSION['userid']) {
-                $PAGE->menu_sub[] = array( 'name' => 'newsfeed:subscription',
-g
+
-                                                              gettext("Feeds")));
-                $PAGE->menu_sub[] = array( 'name' => 'newsfeed:subscription:publish:blog',
-g
+
-                                                              gettext("Publish to blog")));
-            }
-            $PAGE->menu_sub[] = array( 'name' => 'newsclient',
-g
+
-                                                          gettext("View aggregator")));
-        }
-        $PAGE->menu_sub[] = array( 'name' => 'feed',
-g
+
-                                                      gettext("Popular Feeds")));
-
-        /*
-        $PAGE->menu_sub[] = array( 'name' => 'feed',
-g
+
-                                                      "Page help"));
-        */

devel/mod/template/lib.php

@@ -12 +12 @@
-        if ($page_owner == $_SESSION['userid'] && $page_owner != -1) {
-            $PAGE->menu_sub[] = array( 'name' => 'template:change',
-g
+
-                                                          gettext("Change theme")));  
-        }