diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-10 00:51:26 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-10 00:51:26 -0400 |
| commit | 7e38142d4aa080767617724a98c0cf60c70961d0 (patch) | |
| tree | d4befe70bb5f82fa78b82465ddec597e1d67f72e /lib/settingsaction.php | |
| parent | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (diff) | |
Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
Diffstat (limited to 'lib/settingsaction.php')
| -rw-r--r-- | lib/settingsaction.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/settingsaction.php b/lib/settingsaction.php index 22be36720..fe0f48a7a 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -100,8 +100,8 @@ class SettingsAction extends Action { common_element_start('ul', array('id' => 'nav_views')); foreach ($menu as $menuaction => $menudesc) { common_menu_item(common_local_url($menuaction), - _t($menudesc[0]), - _t($menudesc[1]), + _($menudesc[0]), + _($menudesc[1]), $action == $menuaction); } common_element_end('ul'); |