diff options
| author | wclouser@mozilla.com <wclouser@mozilla.com@4eb1ac78-321c-0410-a911-ec516a8615a5> | 2009-08-18 21:41:25 (GMT) |
|---|---|---|
| committer | wclouser@mozilla.com <wclouser@mozilla.com@4eb1ac78-321c-0410-a911-ec516a8615a5> | 2009-08-18 21:41:25 (GMT) |
| commit | b55f40bc37582d91ea936bf6962426d5b2468307 (patch) | |
| tree | 5e3b9eccd414e6810a9e6828753a0b0b22cf0617 | |
| parent | b8b74f6c278a2984a11edef2857ddaf285aa54f8 (diff) | |
Adding back context, bug 501988#32
git-svn-id: http://svn.mozilla.org/addons/trunk@49442 4eb1ac78-321c-0410-a911-ec516a8615a5
110 files changed, 422 insertions, 422 deletions
diff --git a/site/app/controllers/addons_controller.php b/site/app/controllers/addons_controller.php index 1063f95..e01a161 100644 --- a/site/app/controllers/addons_controller.php +++ b/site/app/controllers/addons_controller.php @@ -536,10 +536,10 @@ class AddonsController extends AppController // add rss links to global feeds $this->publish('rssAdd', array( - array('/browse/type:1/cat:all/format:rss?sort=newest', ___('Newest Add-ons')), - array('/browse/type:1/cat:all/format:rss?sort=updated', ___('Updated Add-ons')), - array('/browse/type:1/cat:all/format:rss?sort=popular', ___('Popular Add-ons')), - array('/recommended/format:rss', ___('Featured Add-ons')), + array('/browse/type:1/cat:all/format:rss?sort=newest', ___('Newest Add-ons', 'browse_addons_newest')), + array('/browse/type:1/cat:all/format:rss?sort=updated', ___('Updated Add-ons', 'rss_updatedaddons')), + array('/browse/type:1/cat:all/format:rss?sort=popular', ___('Popular Add-ons', 'browse_addons_popular')), + array('/recommended/format:rss', ___('Featured Add-ons', 'rss_featuredaddons')), )); } @@ -1170,9 +1170,9 @@ class AddonsController extends AppController // set layout details and render view if ($category == 'all') { switch ($sort_by) { - case 'popular': $_title = ___('Popular Add-ons'); break; + case 'popular': $_title = ___('Popular Add-ons', 'browse_addons_popular'); break; case 'updated': $_title = ___('Recently Updated Add-ons'); break; - case 'newest': $_title = ___('Newest Add-ons'); break; + case 'newest': $_title = ___('Newest Add-ons', 'browse_addons_newest'); break; case 'rated': $_title = ___('Add-ons by Rating'); break; case 'name': $_title = ___('Add-ons by Name'); break; default: $_title = ''; break; @@ -1256,7 +1256,7 @@ class AddonsController extends AppController if ($format != 'rss') { $this->set('content_wide', true); // display 2 features next to each other $this->set('collapse_categories', true); - $this->pageTitle = ___('Search Engines').' :: ' + $this->pageTitle = ___('Search Engines', 'addons_searchengines_pagetitle').' :: ' .sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('bigHeader', true); $this->publish('bigHeaderText', sprintf(___('Add-ons extend %1$s, letting you personalize your browsing experience. Take a look around and make %1$s your own.'), APP_PRETTYNAME)); @@ -1266,7 +1266,7 @@ class AddonsController extends AppController $this->render('searchengines'); } else { // RSS feed - $this->publish('rss_title', ___('Search Engines')); + $this->publish('rss_title', ___('Search Engines', 'addons_searchengines_pagetitle')); $this->publish('rss_description', ''); $this->render('rss/searchengines', 'rss'); } @@ -1277,7 +1277,7 @@ class AddonsController extends AppController */ function _plugins() { $this->layout = 'mozilla'; - $this->pageTitle = ___('Plugins').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Plugins', 'addons_plugins_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('subpagetitle', sprintf(___('Common Plugins for %1$s'), APP_PRETTYNAME)); $this->render('plugins'); return; @@ -1399,7 +1399,7 @@ class AddonsController extends AppController $this->publish('platforms', $platforms); // set layout details - $this->pageTitle = ___('Dictionaries & Language Packs') .' :: ' + $this->pageTitle = ___('Dictionaries & Language Packs', 'langtools_header_dicts_and_langpacks') .' :: ' . sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('bigHeader', true); $this->publish('bigHeaderText', sprintf(___('Add-ons extend %1$s, letting you personalize your browsing experience. Take a look around and make %1$s your own.'), APP_PRETTYNAME)); @@ -1513,14 +1513,14 @@ class AddonsController extends AppController $this->publish('platforms', $platforms); $this->layout='mozilla'; - $this->pageTitle = ___('Recommended Add-ons').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Recommended Add-ons', 'addons_recommended_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('addons', $featAddons); $this->publish('rssAdd', array('/recommended/format:rss')); - $this->publish('subpagetitle', ___('Recommended Add-ons')); + $this->publish('subpagetitle', ___('Recommended Add-ons', 'addons_recommended_pagetitle')); $this->render(); } else { $this->publish('addons', $featAddons); - $this->publish('rss_title', ___('Recommended Add-ons').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME)); + $this->publish('rss_title', ___('Recommended Add-ons', 'addons_recommended_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME)); $this->publish('rss_description', ___('With so many great add-ons available, there\'s something for everyone. To get you started, here\'s a list of some of the most popular. Enjoy!')); $this->render('rss/addons', 'rss'); } diff --git a/site/app/controllers/collections_controller.php b/site/app/controllers/collections_controller.php index f9964fd..ac48d81 100644 --- a/site/app/controllers/collections_controller.php +++ b/site/app/controllers/collections_controller.php @@ -108,7 +108,7 @@ class CollectionsController extends AppController array('href' => 'editors_picks', 'text' => ___('Editor\'s Picks')), array('href' => 'popular', - 'text' => ___('Popular')), + 'text' => ___('Popular', 'collections_index_li_popular')), ); if ($this->Session->check('User')) { @@ -186,7 +186,7 @@ class CollectionsController extends AppController $addon['Translation']['name']['string'])); $this->publish('breadcrumbs', array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections', + ___('Collections', 'collections_breadcrumb') => '/collections', $addon['Translation']['name']['string'] => "/addon/{$addon['Addon']['id']}" )); @@ -205,7 +205,7 @@ class CollectionsController extends AppController $this->publish('jsAdd', array('jquery.autocomplete.pack.js')); $this->publish('breadcrumbs', array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' )); // pick initially selected add-ons both from the URI and possible form choices @@ -309,8 +309,8 @@ class CollectionsController extends AppController function _getSortedAddons($collection_id) { $sort_options = array( 'date-added' => ___('Date Added'), - 'name' => ___('Name'), - 'popularity' => ___('Popularity') + 'name' => ___('Name', 'collections_detail_sort_name'), + 'popularity' => ___('Popularity', 'collections_detail_sort_popularity') ); // Fetch #1. What's in the collection? @@ -419,7 +419,7 @@ class CollectionsController extends AppController $this->publish('breadcrumbs', array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' )); $this->render('detail'); @@ -481,7 +481,7 @@ class CollectionsController extends AppController // set up view and render result $this->publish('breadcrumbs', array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' )); return $this->render('subscribe'); } @@ -553,7 +553,7 @@ class CollectionsController extends AppController 'jquery.autocomplete.pack.js')); $this->publish('breadcrumbs', array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' )); } diff --git a/site/app/controllers/components/amo.php b/site/app/controllers/components/amo.php index 5c5331d..1edb2dd 100644 --- a/site/app/controllers/components/amo.php +++ b/site/app/controllers/components/amo.php @@ -196,11 +196,11 @@ class AmoComponent extends Object { break; case STATUS_NOMINATED: $string = ___('In Sandbox; Public Nomination'); break; - case STATUS_PUBLIC: $string = ___('Public'); + case STATUS_PUBLIC: $string = ___('Public', 'addons_status_public'); break; case STATUS_DISABLED: $string = ___('Disabled'); break; - default: $string = ___('Unknown'); + default: $string = ___('Unknown', 'addons_status_unknown'); break; } return $string; @@ -225,7 +225,7 @@ class AmoComponent extends Object { STATUS_SANDBOX => ___('In Sandbox'), STATUS_PENDING => ___('In Sandbox; Pending Review'), STATUS_NOMINATED => ___('In Sandbox; Public Nomination'), - STATUS_PUBLIC => ___('Public'), + STATUS_PUBLIC => ___('Public', 'addons_status_public'), STATUS_DISABLED => ___('Disabled') ); } @@ -718,7 +718,7 @@ class AmoComponent extends Object { $_themes_name = $names[ADDON_THEME]; $catlist = array( - array('name' => ___('Dictionaries & Language Packs'), + array('name' => ___('Dictionaries & Language Packs', 'langtools_header_dicts_and_langpacks'), 'type' => ADDON_DICT, 'cat' => 0, 'weight' => 0), @@ -731,7 +731,7 @@ class AmoComponent extends Object { // add plugins where appropriate if (in_array(ADDON_PLUGIN, $app_listedtypes[APP_ID])) { $catlist[] = array( - 'name' => ___('Plugins'), + 'name' => ___('Plugins', 'addons_plugins_pagetitle'), 'type' => ADDON_PLUGIN, 'cat' => 0, 'weight' => 0, diff --git a/site/app/controllers/components/collections_listing.php b/site/app/controllers/components/collections_listing.php index f12d3cd..028f657 100644 --- a/site/app/controllers/components/collections_listing.php +++ b/site/app/controllers/components/collections_listing.php @@ -68,7 +68,7 @@ class CollectionsListingComponent extends Object { 'text' => ___('Most popular all time'), 'sort' => 'subscribers'), 'newest' => array( - 'text' => ___('Newest'), + 'text' => ___('Newest', 'collections_index_option_newest'), 'sort' => 'created'), ); $sortby = isset($_GET['sortby']) ? $_GET['sortby'] : $sort_default; diff --git a/site/app/controllers/components/editors.php b/site/app/controllers/components/editors.php index c5d8358..83302a1 100644 --- a/site/app/controllers/components/editors.php +++ b/site/app/controllers/components/editors.php @@ -158,7 +158,7 @@ class EditorsComponent extends Object { */ function reviewPendingFiles($addon, $data) { if (empty($data['Approval']['File'])) { - $this->controller->addError(___('Please select at least one file to review.')); + $this->controller->addError(___('Please select at least one file to review.', 'editor_review_error_no_files')); return false; } diff --git a/site/app/controllers/components/stats.php b/site/app/controllers/components/stats.php index b4199d4..ab6ab25 100644 --- a/site/app/controllers/components/stats.php +++ b/site/app/controllers/components/stats.php @@ -423,11 +423,11 @@ class StatsComponent extends Object { ) ), 'prettyNames' => array( - 'version' => ___('Add-on Version'), - 'application' => ___('Application'), - 'status' => ___('Add-on Status'), - 'os' => ___('Operating System'), - 'unknown' => ___('Unknown') + 'version' => ___('Add-on Version', 'statistics_longnames_version'), + 'application' => ___('Application', 'statistics_longnames_application'), + 'status' => ___('Add-on Status', 'statistics_longnames_status'), + 'os' => ___('Operating System', 'statistics_longnames_os'), + 'unknown' => ___('Unknown', 'statistics_longnames_unknown') ), 'shortNames' => array( 'version' => ___('Ver'), diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php index 776f8fd..5ee1715 100644 --- a/site/app/controllers/developers_controller.php +++ b/site/app/controllers/developers_controller.php @@ -86,7 +86,7 @@ class DevelopersController extends AppController $this->Amo->clean($this->data); $this->layout = 'mozilla'; - $this->pageTitle = ___('Developer Tools').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Developer Tools', 'devcp_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->cssAdd = array('developers', 'validation'); $this->publish('cssAdd', $this->cssAdd); @@ -96,10 +96,10 @@ class DevelopersController extends AppController $this->publish('expand_categories', true); - $this->breadcrumbs = array(___('Developer Tools') => '/developers/index'); + $this->breadcrumbs = array(___('Developer Tools', 'devcp_pagetitle') => '/developers/index'); $this->publish('breadcrumbs', $this->breadcrumbs); - $this->publish('subpagetitle', ___('Developer Tools')); + $this->publish('subpagetitle', ___('Developer Tools', 'devcp_pagetitle')); global $native_languages; $this->set('nativeLanguages', $native_languages); diff --git a/site/app/controllers/editors_controller.php b/site/app/controllers/editors_controller.php index 7f7d919..9050b7b 100644 --- a/site/app/controllers/editors_controller.php +++ b/site/app/controllers/editors_controller.php @@ -61,7 +61,7 @@ class EditorsController extends AppController $this->Amo->checkLoggedIn(); $this->layout = 'mozilla'; - $this->pageTitle = ___('Editor Tools').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Editor Tools', 'editors_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->cssAdd = array('editors', 'admin', 'validation'); $this->publish('cssAdd', $this->cssAdd); @@ -74,11 +74,11 @@ class EditorsController extends AppController 'editors'); $this->publish('jsAdd', $this->jsAdd); - $this->breadcrumbs = array(___('Editor Tools') => '/editors/index'); + $this->breadcrumbs = array(___('Editor Tools', 'editors_pagetitle') => '/editors/index'); $this->publish('breadcrumbs', $this->breadcrumbs); $this->publish('suppressJQuery', 1); - $this->publish('subpagetitle', ___('Editor Tools')); + $this->publish('subpagetitle', ___('Editor Tools', 'editors_pagetitle')); // disable query caching so devcp changes are visible immediately foreach ($this->uses as $_model) { @@ -398,7 +398,7 @@ class EditorsController extends AppController 'os' => ___('Tested Operating Systems'), 'applications' => ___('Tested Application'), 'errors' => ___('Please complete the following fields:'), - 'files' => ___('Please select at least one file to review.') + 'files' => ___('Please select at least one file to review.', 'editors_error_review_one_file') )); // Validation results @@ -517,7 +517,7 @@ class EditorsController extends AppController 'editors_review_comment_help_heading' => ___('Comment Help'), 'editors_syntax_view_source' => ___('View Source'), 'editors_syntax_print' => ___('Print'), - 'editors_syntax_about' => ___('About'), + 'editors_syntax_about' => ___('About', 'editors_syntax_about'), )); $this->render('review'); @@ -1671,9 +1671,9 @@ class EditorsController extends AppController } // Setup title and breadcrumbs - $this->breadcrumbs[___('Featured Add-ons')] = '/editors/featured'; + $this->breadcrumbs[___('Featured Add-ons', 'editors_featured_addons_pagetitle')] = '/editors/featured'; $this->publish('breadcrumbs', $this->breadcrumbs); - $this->publish('subpagetitle', ___('Featured Add-ons')); + $this->publish('subpagetitle', ___('Featured Add-ons', 'editors_featured_addons_pagetitle')); // Get all featured Addons $features = $this->AddonCategory->findAllByFeature(1, array('addon_id')); @@ -1748,7 +1748,7 @@ class EditorsController extends AppController * Display logs */ function logs() { - $this->breadcrumbs[___('Event Log')] = '/editors/logs'; + $this->breadcrumbs[___('Event Log', 'editorcp_logs_page_heading')] = '/editors/logs'; $this->set('breadcrumbs', $this->breadcrumbs); //Default conditions are the current month diff --git a/site/app/controllers/pages_controller.php b/site/app/controllers/pages_controller.php index dfc1f01..a50e20f 100644 --- a/site/app/controllers/pages_controller.php +++ b/site/app/controllers/pages_controller.php @@ -89,7 +89,7 @@ class PagesController extends AppController{ case 'appversions': $title = ___('Application Versions'); break; case 'credits': - $title = ___('Credits'); break; + $title = ___('Credits', 'page_title_credits'); break; case 'fashionyourfirefox_faq': $title = ___('Fashion your Firefox FAQ'); $this->set('cssAdd', array('collection-style')); @@ -106,15 +106,15 @@ class PagesController extends AppController{ case 'sandbox': $title = ___('Sandbox Review System'); break; case 'submissionhelp': - $title = ___('Submission Help'); break; + $title = ___('Submission Help', 'page_title_submissionhelp'); break; case 'faq': - $title = ___('Frequently Asked Questions'); break; + $title = ___('Frequently Asked Questions', 'page_title_faq'); break; case 'developer_faq': $title = ___('Developer FAQ'); break; case 'developer_agreement': $title = ___('Developer Agreement'); break; case 'collector': - $title = ___('Add-on Collector'); + $title = ___('Add-on Collector', 'page_title_collector'); $this->publish('collectionSearch', true); break; case 'collector_faq': $title = ___('Add-on Collector FAQ'); diff --git a/site/app/controllers/previews_controller.php b/site/app/controllers/previews_controller.php index 10e0721..2f93692 100644 --- a/site/app/controllers/previews_controller.php +++ b/site/app/controllers/previews_controller.php @@ -64,7 +64,7 @@ class PreviewsController extends AppController $this->Amo->clean($this->data); $this->layout = 'mozilla'; - $this->pageTitle = ___('Developer Tools').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Developer Tools', 'devcp_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->cssAdd = array('developers'); $this->publish('cssAdd', $this->cssAdd); @@ -76,10 +76,10 @@ class PreviewsController extends AppController ,'jquery-compressed.js'); $this->publish('jsAdd', $this->jsAdd); - $this->breadcrumbs = array(___('Developer Tools') => '/developers/index'); + $this->breadcrumbs = array(___('Developer Tools', 'devcp_pagetitle') => '/developers/index'); $this->publish('breadcrumbs', $this->breadcrumbs); - $this->publish('subpagetitle', ___('Developer Tools')); + $this->publish('subpagetitle', ___('Developer Tools', 'devcp_pagetitle')); global $native_languages; $this->publish('nativeLanguages', $native_languages); @@ -100,8 +100,8 @@ class PreviewsController extends AppController */ function add($addon_id) { $this->Amo->clean($addon_id); - $this->publish('subpagetitle', ___('Add Preview')); - $this->breadcrumbs[___('Add Preview')] = '/previews/add/'.$addon_id; + $this->publish('subpagetitle', ___('Add Preview', 'devcp_preview_add_pagetitle')); + $this->breadcrumbs[___('Add Preview', 'devcp_preview_add_pagetitle')] = '/previews/add/'.$addon_id; $this->publish('breadcrumbs', $this->breadcrumbs); if (!$this->Amo->checkOwnership($addon_id)) { @@ -165,7 +165,7 @@ class PreviewsController extends AppController $localizedFields = array( 'caption' => array( 'type' => 'input', - 'display' => ___('Preview Caption'), + 'display' => ___('Preview Caption', 'devcp_addon_field_preview_caption_displaytitle'), 'model' => 'Preview', 'field' => 'caption', 'attributes' => array( @@ -191,8 +191,8 @@ class PreviewsController extends AppController */ function edit($id) { $this->Amo->clean($id); - $this->set ('subpagetitle', ___('Edit Preview')); - $this->breadcrumbs[___('Edit Preview')] = '/previews/edit/'.$id; + $this->set ('subpagetitle', ___('Edit Preview', 'devcp_preview_edit_pagetitle')); + $this->breadcrumbs[___('Edit Preview', 'devcp_preview_edit_pagetitle')] = '/previews/edit/'.$id; $this->publish('breadcrumbs', $this->breadcrumbs); $this->Preview->id = $id; @@ -274,7 +274,7 @@ class PreviewsController extends AppController $localizedFields = array( 'caption' => array( 'type' => 'input', - 'display' => ___('Preview Caption'), + 'display' => ___('Preview Caption', 'devcp_addon_field_preview_caption_displaytitle'), 'model' => 'Preview', 'field' => 'caption', 'attributes' => array( diff --git a/site/app/controllers/reviews_controller.php b/site/app/controllers/reviews_controller.php index 63d43cb..f50961b 100644 --- a/site/app/controllers/reviews_controller.php +++ b/site/app/controllers/reviews_controller.php @@ -199,7 +199,7 @@ class ReviewsController extends AppController $this->publish('reviews_others_counts', $others_counts); $this->publish('reviews', $reviews); - $_title = sprintf(___('Reviews for %s'), $addon['Translation']['name']['string']); + $_title = sprintf(___('Reviews for %s', 'addon_review_pagetitle'), $addon['Translation']['name']['string']); if ($format != 'rss') { $this->pageTitle = $_title.' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); @@ -248,7 +248,7 @@ class ReviewsController extends AppController } $this->publish('addon', $addon); - $_title = sprintf(___('Reviews for %s'), $addon['Translation']['name']['string']); + $_title = sprintf(___('Reviews for %s', 'addon_review_pagetitle'), $addon['Translation']['name']['string']); $this->pageTitle = $_title .' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); // fetch user object from session @@ -343,7 +343,7 @@ class ReviewsController extends AppController } $this->publish('addon', $addon); - $_title = sprintf(___('Reviews for %s'), $addon['Translation']['name']['string']); + $_title = sprintf(___('Reviews for %s', 'addon_review_pagetitle'), $addon['Translation']['name']['string']); $this->pageTitle = $_title .' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); // fetch user object from session @@ -422,7 +422,7 @@ class ReviewsController extends AppController $review = $this->Review->findById($id, null, null, 2); $review['Addon'] = $this->Addon->findById($review['Version']['addon_id'], array('id', 'name'), null, -1); - $_title = sprintf(___('Reviews for %s'), $review['Addon']['Translation']['name']['string']); + $_title = sprintf(___('Reviews for %s', 'addon_review_pagetitle'), $review['Addon']['Translation']['name']['string']); $this->pageTitle = $_title .' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('breadcrumbs', array( diff --git a/site/app/controllers/search_controller.php b/site/app/controllers/search_controller.php index 8125fa7..1170a47 100644 --- a/site/app/controllers/search_controller.php +++ b/site/app/controllers/search_controller.php @@ -295,12 +295,12 @@ class SearchController extends AppController list($sort_opts, $sortby) = $this->CollectionsListing->sorting(); // Prep and render the view - $this->pageTitle = ___('Collection Search Results').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Collection Search Results', 'search_collections_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('jsAdd', array('amo2009/collections', 'jquery-ui/jqModal.js')); $this->publish('breadcrumbs', array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' )); $this->publish('collapse_categories', true); diff --git a/site/app/controllers/statistics_controller.php b/site/app/controllers/statistics_controller.php index e15480c..2d2122c 100644 --- a/site/app/controllers/statistics_controller.php +++ b/site/app/controllers/statistics_controller.php @@ -64,7 +64,7 @@ class StatisticsController extends AppController $this->Amo->clean($this->data); $this->layout = 'amo2009'; - $this->pageTitle = ___('Statistics Dashboard').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('Statistics Dashboard', 'statistics_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->cssAdd = array('stats/stats'); $this->publish('cssAdd', $this->cssAdd); @@ -75,10 +75,10 @@ class StatisticsController extends AppController $prescriptJS = "var statsURL = '".$this->url('/statistics/')."';"; $this->set('prescriptJS', $prescriptJS); - $this->breadcrumbs = array(___('Statistics Dashboard') => '/statistics/index'); + $this->breadcrumbs = array(___('Statistics Dashboard', 'statistics_pagetitle') => '/statistics/index'); $this->publish('breadcrumbs', $this->breadcrumbs); - $this->publish('subpagetitle', ___('Statistics Dashboard')); + $this->publish('subpagetitle', ___('Statistics Dashboard', 'statistics_pagetitle')); } /** @@ -122,7 +122,7 @@ class StatisticsController extends AppController $this->publish('statsOverview', $this->_cachedStats('getSiteStatsOverview', array())); $this->publish('jsLocalization', array( - 'addons_downloaded' => ___('Add-ons Downloaded'), + 'addons_downloaded' => ___('Add-ons Downloaded', 'statistics_addons_downloaded'), 'addons_in_use' => ___('Add-ons In Use'), 'addons_created' => ___('Add-ons Created'), 'addons_updated' => ___('Add-ons Updated'), @@ -290,25 +290,25 @@ class StatisticsController extends AppController } } $this->set('stats', $stats); - $this->pageTitle = $addon['Translation']['name']['string'].' :: '.___('Statistics Dashboard').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = $addon['Translation']['name']['string'].' :: '.___('Statistics Dashboard', 'statistics_pagetitle').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); if (!$rss) { $this->publish('jsLocalization', array( 'date' => ___('%B %e, %Y'), 'statistics_js_dropdowns_removeplot' => ___('Remove this plot'), - 'statistics_js_dropdowns_none' => ___('none'), + 'statistics_js_dropdowns_none' => ___('none', 'statistics_js_dropdowns_none'), 'statistics_js_download_csv' => ___('View this table in CSV format'), 'statistics_js_groupby_selector_date' => ___('Group by: Day'), 'statistics_js_groupby_selector_week' => ___('Group by: Week'), 'statistics_js_groupby_selector_week_over_week' => ___('Compare by: Week'), 'statistics_js_groupby_selector_month' => ___('Group by: Month'), - 'statistics_js_plotselection_selector_summary' => ___('Summary'), - 'statistics_js_plotselection_selector_downloads' => ___('Downloads'), - 'statistics_js_plotselection_selector_adu' => ___('Active Daily Users'), - 'statistics_js_plotselection_selector_version' => ___('Add-on Version'), - 'statistics_js_plotselection_selector_application' => ___('Application'), - 'statistics_js_plotselection_selector_status' => ___('Add-on Status'), - 'statistics_js_plotselection_selector_os' => ___('Operating System'), + 'statistics_js_plotselection_selector_summary' => ___('Summary', 'statistics_js_plotselection_selector_summary'), + 'statistics_js_plotselection_selector_downloads' => ___('Downloads', 'statistics_js_plotselection_selector_downloads'), + 'statistics_js_plotselection_selector_adu' => ___('Active Daily Users', 'statistics_js_plotselection_selector_adu'), + 'statistics_js_plotselection_selector_version' => ___('Add-on Version', 'statistics_js_plotselection_selector_version'), + 'statistics_js_plotselection_selector_application' => ___('Application', 'statistics_js_plotselection_selector_application'), + 'statistics_js_plotselection_selector_status' => ___('Add-on Status', 'statistics_js_plotselection_selector_status'), + 'statistics_js_plotselection_selector_os' => ___('Operating System', 'statistics_js_plotselection_selector_os'), 'statistics_js_plotselection_selector_custom' => ___('Custom'), 'statistics_js_plotselection_foundinrange' => ___('%s found in range'), 'statistics_js_plotselection_options_count_name_checked' => ___('Hide Total Count'), diff --git a/site/app/controllers/users_controller.php b/site/app/controllers/users_controller.php index 0467d57..edb5736 100644 --- a/site/app/controllers/users_controller.php +++ b/site/app/controllers/users_controller.php @@ -93,10 +93,10 @@ class UsersController extends AppController $this->disableCache(); - $this->pageTitle = ___('New User Registration'). ' :: '. sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('New User Registration', 'user_form_registration'). ' :: '. sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); // $this->publish('cssAdd', array('forms')); - $this->publish('breadcrumbs', array(___('New User Registration') => '/users/register')); - $this->publish('subpagetitle', ___('New User Registration')); + $this->publish('breadcrumbs', array(___('New User Registration', 'user_form_registration') => '/users/register')); + $this->publish('subpagetitle', ___('New User Registration', 'user_form_registration')); if (empty($this->data)) { $this->render(); return; @@ -333,9 +333,9 @@ class UsersController extends AppController return; } - $this->pageTitle = ___('User Login').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); + $this->pageTitle = ___('User Login', 'user_form_login').' :: '.sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME); $this->publish('cssAdd', array('forms')); - $this->publish('subpagetitle', ___('User Login')); + $this->publish('subpagetitle', ___('User Login', 'user_form_login')); $this->publish('loginerror', false); // by default, just give them a login screen diff --git a/site/app/models/addontype.php b/site/app/models/addontype.php index 1909573..18feb05 100644 --- a/site/app/models/addontype.php +++ b/site/app/models/addontype.php @@ -74,9 +74,9 @@ class Addontype extends AppModel case ADDON_EXTENSION: return ___('Extension'); case ADDON_THEME: - return ___('Theme'); + return ___('Theme', 'general_addontype_theme'); case ADDON_DICT: - return ___('Dictionary'); + return ___('Dictionary', 'general_addontype_dict'); case ADDON_SEARCH: return ___('Search Engine'); case ADDON_LPAPP: @@ -96,12 +96,12 @@ class Addontype extends AppModel function getNames() { $addontypes = array( ADDON_EXTENSION => ___('Extensions'), - ADDON_THEME => ___('Themes'), + ADDON_THEME => ___('Themes', 'general_addontype_theme_plural'), ADDON_DICT => ___('Dictionaries'), - ADDON_SEARCH => ___('Search Engines'), + ADDON_SEARCH => ___('Search Engines', 'general_addontype_search_plural'), ADDON_LPAPP => ___('Language Packs (Application)'), ADDON_LPADDON => ___('Language Packs (Add-on)'), - ADDON_PLUGIN => ___('Plugins') + ADDON_PLUGIN => ___('Plugins', 'general_addontype_plugin_plural') ); return $addontypes; diff --git a/site/app/models/test_case.php b/site/app/models/test_case.php index b2b437c..daf3491 100644 --- a/site/app/models/test_case.php +++ b/site/app/models/test_case.php @@ -66,7 +66,7 @@ class TestCase extends AppModel $names = array( '11' => ___('General Verification Tests'), '12' => ___('install.rdf Verification Tests'), - '13' => ___('File Type Verification'), + '13' => ___('File Type Verification', 'test_case_name_all_general_verifyFileTypes'), '14' => ___('JavaScript Namespace Pollution Tests'), '21' => ___('Unsafe JavaScript Tests'), '22' => ___('Unsafe Settings Tests'), @@ -75,17 +75,17 @@ class TestCase extends AppModel '31' => ___('L10n Completeness Check'), '121' => ___('Geolocation Check'), '122' => ___('Conduit Toolbar Check'), - '211' => ___('File Layout Check'), - '212' => ___('File Type Verification'), + '211' => ___('File Layout Check', 'test_case_name_dictionary_general_verifyFileLayout'), + '212' => ___('File Type Verification', 'test_case_name_all_general_verifyFileTypes'), '213' => ___('SeaMonkey Valid Files Check'), '221' => ___('install.js Verification'), - '311' => ___('File Layout Check'), - '312' => ___('File Type Verification'), + '311' => ___('File Layout Check', 'test_case_name_dictionary_general_verifyFileLayout'), + '312' => ___('File Type Verification', 'test_case_name_all_general_verifyFileTypes'), '321' => ___('Unsafe HTML Check'), '322' => ___('Remote Loading Check'), - '323' => ___('chrome.manifest Check'), - '411' => ___('File Layout Check'), - '421' => ___('chrome.manifest Check'), + '323' => ___('chrome.manifest Check', 'test_case_name_langpack_security_checkChromeManifest'), + '411' => ___('File Layout Check', 'test_case_name_dictionary_general_verifyFileLayout'), + '421' => ___('chrome.manifest Check', 'test_case_name_langpack_security_checkChromeManifest'), '511' => ___('Opensearch Format Check'), '521' => ___('UpdateURL Check') ); @@ -94,7 +94,7 @@ class TestCase extends AppModel $descriptions = array( '11' => ___('General Verification Tests'), '12' => ___('install.rdf Verification Tests'), - '13' => ___('File Type Verification'), + '13' => ___('File Type Verification', 'test_case_name_all_general_verifyFileTypes'), '14' => ___('JavaScript Namespace Pollution Tests'), '21' => ___('Unsafe JavaScript Tests'), '22' => ___('Unsafe Settings Tests'), @@ -103,17 +103,17 @@ class TestCase extends AppModel '31' => ___('L10n Completeness Check'), '121' => ___('Geolocation Check'), '122' => ___('Conduit Toolbar Check'), - '211' => ___('File Layout Check'), - '212' => ___('File Type Verification'), + '211' => ___('File Layout Check', 'test_case_name_dictionary_general_verifyFileLayout'), + '212' => ___('File Type Verification', 'test_case_name_all_general_verifyFileTypes'), '213' => ___('SeaMonkey Valid Files Check'), '221' => ___('install.js Verification'), - '311' => ___('File Layout Check'), - '312' => ___('File Type Verification'), + '311' => ___('File Layout Check', 'test_case_name_dictionary_general_verifyFileLayout'), + '312' => ___('File Type Verification', 'test_case_name_all_general_verifyFileTypes'), '321' => ___('Unsafe HTML Check'), '322' => ___('Remote Loading Check'), - '323' => ___('chrome.manifest Check'), - '411' => ___('File Layout Check'), - '421' => ___('chrome.manifest Check'), + '323' => ___('chrome.manifest Check', 'test_case_name_langpack_security_checkChromeManifest'), + '411' => ___('File Layout Check', 'test_case_name_dictionary_general_verifyFileLayout'), + '421' => ___('chrome.manifest Check', 'test_case_name_langpack_security_checkChromeManifest'), '511' => ___('Opensearch Format Check'), '521' => ___('UpdateURL Check') ); diff --git a/site/app/views/addons/browse_thumbs.thtml b/site/app/views/addons/browse_thumbs.thtml index 0768209..ad64536 100644 --- a/site/app/views/addons/browse_thumbs.thtml +++ b/site/app/views/addons/browse_thumbs.thtml @@ -54,7 +54,7 @@ $this->layout = 'amo2009'; <div class="secondary"> <div class="highlight" id="thumb-subcategories"> - <h3><?=___('Themes')?></h3> + <h3><?=___('Themes', 'general_addontype_theme_plural')?></h3> <ul class="subcategories"> <li<?= ($this_category == FALSE) ? ' class="selected"' : '' ?>><?=$html->link( 'All', diff --git a/site/app/views/addons/dictionaries.thtml b/site/app/views/addons/dictionaries.thtml index d726715..aeb2b55 100644 --- a/site/app/views/addons/dictionaries.thtml +++ b/site/app/views/addons/dictionaries.thtml @@ -60,13 +60,13 @@ $this->layout = 'amo2009'; <?php /* list of dictionaries and language packs */ ?> <div class="featured"><div class="featured-inner"> <div id="dictionaries"> - <h3><?=___('Dictionaries & Language Packs')?></h3> + <h3><?=___('Dictionaries & Language Packs', 'langtools_header_dicts_and_langpacks')?></h3> <table summary="<?=___('List of language packs and dictionaries.')?>"> <thead> <tr> <th scope="col" colspan="2"><?=___('Language')?></th> - <th scope="col"><?=___('Dictionary')?></th> + <th scope="col"><?=___('Dictionary', 'langtools_tableheader_dictionary')?></th> <th scope="col"><?=___('Language Pack')?></th> </tr> </thead> diff --git a/site/app/views/addons/display.thtml b/site/app/views/addons/display.thtml index 5dd1e54..ad36108 100644 --- a/site/app/views/addons/display.thtml +++ b/site/app/views/addons/display.thtml @@ -171,18 +171,18 @@ if (!empty($coll_addon_added)) { </tr> <?php if (!empty($addon['Translation']['homepage']['string'])): ?> <tr> - <th><?=___('Homepage')?></th> + <th><?=___('Homepage', 'addons_display_header_homepage')?></th> <td><strong> <?=$html->link($addon['Translation']['homepage']['string'])?> </strong></td> </tr> <?php endif ?> <tr> - <th><?=___('Rating')?></th> + <th><?=___('Rating', 'advanced_search_form_rating')?></th> <td><?=$this->renderElement('amo2009/reviews', array('addon' => $addon))?></td> </tr> <tr> - <th><?=___('Downloads')?></th> + <th><?=___('Downloads', 'list_sortby_downloads')?></th> <td> <strong class="downloads"> <?=$html->number_format($addon['Addon']['totaldownloads'], 0)?> @@ -268,10 +268,10 @@ if (!empty($coll_addon_added)) { $html->link($support_url), $link->email($support_email));?> <?php elseif ($has_url): ?> - <?=sprintf(___('Support for this add-on is provided by the developer at %s'), + <?=sprintf(___('Support for this add-on is provided by the developer at %s', 'addons_display_paragraph_supportinfoemail'), $html->link($support_url));?> <?php elseif ($has_email): ?> - <?=sprintf(___('Support for this add-on is provided by the developer at %s'), + <?=sprintf(___('Support for this add-on is provided by the developer at %s', 'addons_display_paragraph_supportinfoemail'), $link->email($support_email));?> <?php endif; ?> </p> @@ -279,7 +279,7 @@ if (!empty($coll_addon_added)) { <?php $comments = $addon['Translation']['developercomments']['string'] ?> <?php if (!empty($comments)): ?> - <h4><?=___('Developer Comments')?></h4> + <h4><?=___('Developer Comments', 'addons_display_developer_comments')?></h4> <p <?=$addon['Translation']['developercomments']['locale_html']?>> <?=nl2br($addon['Translation']['developercomments']['string'])?> </p> @@ -335,7 +335,7 @@ if (!empty($coll_addon_added)) { cols="30" rows="6"></textarea> </div> <div class="container"> - <label for="review-rating"><?=___('Rating')?></label> + <label for="review-rating"><?=___('Rating', 'advanced_search_form_rating')?></label> <select id="review-rating" name="data[Review][rating]"> <option></option> <option value="1" class="worst">*</option> @@ -366,7 +366,7 @@ if (!empty($coll_addon_added)) { <?php endif; /* isAuthor */ ?> <?php if ($hasversion): ?> - <h3><?=___('Release Notes')?></h3> + <h3><?=___('Release Notes', 'addons_display_release_notes')?></h3> <div class="article"> <?=$this->renderElement('addon_version_detail', $_version_data)?> <p id="release-notes" <?=$addon['Version'][0]['Translation']['releasenotes']['locale_html']?>> @@ -384,7 +384,7 @@ if (!empty($coll_addon_added)) { <h5 id="license"> <?=___('Source Code License')?> <a href="<?=$html->url('/pages/developer_faq#license')?>"> - <?=___("What's this?")?> + <?=___('What's this?', 'addons_display_a_license_what')?> </a> </h5> <p><?=$license_link?></p> @@ -456,7 +456,7 @@ if (!empty($coll_addon_added)) { echo '<select id="addons-author-addons-select" name="addons-author-addons-select" onchange="this.form.submit()">'; echo $this->renderElement('addon_author_addons', array('tag' => 'option')); echo '</select>'; - echo '<input class="hidden" type="submit" value="'.___('Go').'"/>'; + echo '<input class="hidden" type="submit" value="'.___('Go', 'addons_author_addons_submit').'"/>'; echo '</form>'; } else { echo '<ul class="xoxo">'; @@ -470,7 +470,7 @@ if (!empty($coll_addon_added)) { <?php endif; ?> <div class="highlight"> -<h3><?=___('Tags')?></h3> +<h3><?=___('Tags', 'tags_header_tags_title')?></h3> <script type="text/javascript"> <?=$this->renderElement('tags_js_init')?> @@ -487,7 +487,7 @@ if (!empty($coll_addon_added)) { <?=$html->hiddenSession() ?> <input type="text" id='newTag' name="newTag" /> <input type="hidden" name="addonid" id="addtagformaddonid" value="<?=$addon['Addon']['id']?>" /> - <button id="addtagbutton"><?=___('Add');?></button> + <button id="addtagbutton"><?=___('Add', 'tags_add_tag_button');?></button> </form> <span class="hint"><?=___('Comma-separated, minimum of 2 characters. Example: <span class="example">ocean, sail boat, water</span>')?></span> </div> @@ -527,7 +527,7 @@ if (!empty($coll_addon_added)) { <form action="<?= $html->url('/collections/addtocollection') ?>" method="post" id="coll_publish"> <div> <h3><label for="publish_to"><?=___('Add to a collection:')?></label></h3> - <?=$html->link(___("What's this?"), '/collections/')?> + <?=$html->link(___('What's this?', 'addons_display_a_license_what'), '/collections/')?> <?=$html->hiddenSession() ?> <input name="data[addon_id]" type="hidden" value="<?= $addon['Addon']['id'] ?>" /> <select name="data[collection_uuid]" id="publish_to"> diff --git a/site/app/views/addons/home.thtml b/site/app/views/addons/home.thtml index d26097b..0de662b 100644 --- a/site/app/views/addons/home.thtml +++ b/site/app/views/addons/home.thtml @@ -107,7 +107,7 @@ $this->viewVars['bodyclass'] = 'home'; <li<?= ('recommended'==$featured_type) ? ' class="selected"' : '' ?>> <a href="?featured=recommended#featured"><?=___('Recommended')?></a></li> <li<?= ('popular'==$featured_type) ? ' class="selected"' : '' ?>> - <a href="?featured=popular#featured"><?=___('Popular')?></a></li> + <a href="?featured=popular#featured"><?=___('Popular', 'addons_home_browse_popular')?></a></li> <li<?= ('added'==$featured_type) ? ' class="selected"' : '' ?>> <a href="?featured=added#featured"><?=___('Just Added')?></a></li> <li<?= ('updated'==$featured_type) ? ' class="selected"' : '' ?>> @@ -139,7 +139,7 @@ $this->viewVars['bodyclass'] = 'home'; <div class="secondary"> <img class="pull-right" src="<?=$html->url('/img/amo2009/illustrations/logo-collections-100x125.png', null, false, false)?>" alt=""/> - <h3><a href="<?=$html->url('/collections')?>"><?=___('Collections')?></a> + <h3><a href="<?=$html->url('/collections')?>"><?=___('Collections', 'addons_home_collections')?></a> <?=$this->renderElement('amo2009/new_indicator')?> </h3> <p><?=___('Collections are a way for you to categorize, mix, match and mingle add-ons. Subscribe to collections created by other users or create your own.')?></p> diff --git a/site/app/views/admin/flagged_queue.thtml b/site/app/views/admin/flagged_queue.thtml index 1c10f67..807d2c7 100644 --- a/site/app/views/admin/flagged_queue.thtml +++ b/site/app/views/admin/flagged_queue.thtml @@ -50,7 +50,7 @@ <table width="100%" id="flagged"> <tr class="queueHeader"> <td> </td> - <td><?=___('Add-on')?></td> + <td><?=___('Add-on', 'editors_th_addon')?></td> <td>Review</td> <td>Flagged on</td> <td>Flagged by</td> diff --git a/site/app/views/admin/logs.thtml b/site/app/views/admin/logs.thtml index 4ec0ea5..740ceee 100644 --- a/site/app/views/admin/logs.thtml +++ b/site/app/views/admin/logs.thtml @@ -40,7 +40,7 @@ <?=$this->renderElement('developers/adminmenu');?> <div id="content-main"> - <h3><?=___('Event Log')?></h3> + <h3><?=___('Event Log', 'editorcp_logs_page_heading')?></h3> <form id="logFilter" method="get" action=""> <div> <?=sprintf(___('View entries between %1$s and %2$s'), @@ -88,7 +88,7 @@ <option>user:*</option> <option>user:group_associated</option> </select> - <?=$html->submit(___('Filter'))?> + <?=$html->submit(___('Filter', 'editorcp_logs_button_filter'))?> </form> <?php if (!empty($logs)) { diff --git a/site/app/views/admin/users_edit.thtml b/site/app/views/admin/users_edit.thtml index 6d3c4a3..fccf5a3 100644 --- a/site/app/views/admin/users_edit.thtml +++ b/site/app/views/admin/users_edit.thtml @@ -96,11 +96,11 @@ $this->translationBox = array( <?=$html->checkBox('User/sandboxshown', null, array('checked' => ($user['User']['sandboxshown'] ? 'checked' : false), 'value' => 1)) ?> </div> <div class="line"> - <label class="amo-label-large" for="UserLocation"><?=___('Location')?></label> + <label class="amo-label-large" for="UserLocation"><?=___('Location', 'user_form_location')?></label> <?=$html->input('User/location', array('value' => stripslashes($user['User']['location']))) ?> </div> <div class="line"> - <label class="amo-label-large" for="UserOccupation"><?=___('Occupation')?></label> + <label class="amo-label-large" for="UserOccupation"><?=___('Occupation', 'user_form_occupation')?></label> <?=$html->input('User/occupation', array('value' => stripslashes($user['User']['occupation']))) ?> </div> <div> diff --git a/site/app/views/api/api_addon.thtml b/site/app/views/api/api_addon.thtml index a7added..6b17fad 100644 --- a/site/app/views/api/api_addon.thtml +++ b/site/app/views/api/api_addon.thtml @@ -52,9 +52,9 @@ <guid><?php echo $addon['Addon']['guid']; ?></guid> <version><?php echo $addon['install_version']; ?></version> <status id='<?php echo $addon['Addon']['status']; ?>'><?php if ($addon['Addon']['status'] == STATUS_PUBLIC) { - echo rtrim(___('Public')); + echo rtrim(___('Public', 'a_header_public')); } else { - echo rtrim(___('Sandbox')); + echo rtrim(___('Sandbox', 'a_header_sandbox')); } ?></status> <authors> diff --git a/site/app/views/api/collections_feed.thtml b/site/app/views/api/collections_feed.thtml index f1c60a8..5cde5c2 100644 --- a/site/app/views/api/collections_feed.thtml +++ b/site/app/views/api/collections_feed.thtml @@ -72,9 +72,9 @@ if (isset($error)) { ?> <version><?php echo $addon['install_version']; ?></version> <status id='<?php echo $addon['status']; ?>'><?php if ($addon['status'] == STATUS_PUBLIC) { - echo rtrim(___('Public')); + echo rtrim(___('Public', 'a_header_public')); } else { - echo rtrim(___('Sandbox')); + echo rtrim(___('Sandbox', 'a_header_sandbox')); } ?></status> <authors> diff --git a/site/app/views/collections/add.thtml b/site/app/views/collections/add.thtml index 01f70c1..001cbc8 100644 --- a/site/app/views/collections/add.thtml +++ b/site/app/views/collections/add.thtml @@ -45,7 +45,7 @@ </div> <div id="collections-add" class="primary" role="main"> <?=$this->renderElement('amo2009/breadcrumbs')?> - <h2><?=___('Create a Collection')?></h2> + <h2><?=___('Create a Collection', 'collections_add_header')?></h2> <p><?=___('It\'s easy to create your own collection of add-ons by filling in a few fields below.')?></p> diff --git a/site/app/views/collections/detail.thtml b/site/app/views/collections/detail.thtml index 47ebb26..31b9578 100644 --- a/site/app/views/collections/detail.thtml +++ b/site/app/views/collections/detail.thtml @@ -136,7 +136,7 @@ $c = $collection['Collection']; <option value="<?=$value?>" <?=$selected?>><?=$text?></option> <?php endforeach; ?> </select> - <button><?=___('Go')?></button> + <button><?=___('Go', 'collections_index_button_go')?></button> </div> </form> <?=$this->renderElement('amo2009/separated_list_items', array( diff --git a/site/app/views/collections/edit.thtml b/site/app/views/collections/edit.thtml index 6ae1b96..53b8c03 100644 --- a/site/app/views/collections/edit.thtml +++ b/site/app/views/collections/edit.thtml @@ -93,8 +93,8 @@ JS; 'type' => 'warning', 'msg' => ___('Your collection is about to be deleted!'), 'description' => sprintf(___('Upon clicking "%1$s" below, your collection will be deleted. If you do not want to delete your collection, uncheck the confirmation box in the "%2$s" tab and continue editing your collection. If you leave this page without saving, your collection will also not be deleted.'), - ___('Delete Collection'), - ___('Advanced')), + ___('Delete Collection', 'collections_edit_formfield_deletecollection'), + ___('Advanced', 'collections_edit_tabheader_advanced')), 'htmlattributes' => array( 'id' => 'delete-warning', 'style' => 'display:none' @@ -108,9 +108,9 @@ JS; <li><a href="#details"><span><?=___('Name & Details')?></span></a></li> <li><a href="#permissions"><span><?=___('Permissions')?></span></a></li> <?php endif; ?> - <li><a href="#addons"><span><?=___('Add-ons')?></span></a></li> + <li><a href="#addons"><span><?=___('Add-ons', 'collections_edit_tabheader_addons')?></span></a></li> <?php if ($atleast_manager): ?> - <li><a href="#advanced"><span><?=___('Advanced')?></span></a></li> + <li><a href="#advanced"><span><?=___('Advanced', 'collections_edit_tabheader_advanced')?></span></a></li> <?php endif; ?> </ul> @@ -167,7 +167,7 @@ JS; <?php endif;?> <input id="CollectionIcon" type="file" name="icon"/> <span class="toberemoved" style="display:none"><?=sprintf(___('Icon will be removed when "%1$s" is clicked below'), ___('Update Collection'))?></span> - <a href="#" class="cancel" style="display:none"><?=___('Cancel')?></a> + <a href="#" class="cancel" style="display:none"><?=___('Cancel', 'collections_edit_icon_cancel')?></a> <noscript> <p> @@ -208,7 +208,7 @@ JS; <div id="publishers" class="jsonly"> <ul></ul> <label for="PublishersAdd"><?=___('Enter the e-mail address of a Firefox Add-ons account:')?></label><br/> - <?=$html->input('Publishers/add')?> <input type="button" value="<?=___('Add')?>" /> + <?=$html->input('Publishers/add')?> <input type="button" value="<?=___('Add', 'collections_edit_formfield_users_submit')?>" /> <?=$html->image('ajax_loading.gif', array('style'=>'display:none', 'width'=>15, 'height'=>15, 'alt'=>'searching'))?> </div> <noscript><div> @@ -230,7 +230,7 @@ JS; <div id="managers" class="jsonly"> <ul></ul> <label for="ManagersAdd"><?=___('Enter the e-mail address of a Firefox Add-ons account:')?></label><br/> - <?=$html->input('Managers/add')?> <input type="button" value="<?=___('Add')?>" /> + <?=$html->input('Managers/add')?> <input type="button" value="<?=___('Add', 'collections_edit_formfield_users_submit')?>" /> <?=$html->image('ajax_loading.gif', array('style'=>'display:none', 'width'=>15, 'height'=>15, 'alt'=>'searching'))?> </div> <noscript><div> @@ -258,7 +258,7 @@ JS; <h3><?=___('Current Add-ons:')?></h3> <div class="coll-addon" id="addon-new" style="display:none"> <p><img src="" alt=""/><span class="name"></span><span class="added"><?=___('Added %1$s by %2$s')?></span></p> - <a href="#" class="removeaddon"><?=___('Remove')?></a> + <a href="#" class="removeaddon"><?=___('Remove', 'collections_edit_addons_listitem_remove')?></a> <blockquote title="publishercomment"></blockquote> <a href="#" class="addlink"><?=___('Add publisher comment')?></a> <div class="editdelete"> @@ -291,12 +291,12 @@ JS; <?php endif; ?> <fieldset> - <h4><?=___('Delete Collection')?></h4> + <h4><?=___('Delete Collection', 'collections_edit_formfield_deletecollection')?></h4> <p><?=___('Deleting your collection will permanently erase it.')?></p> - <input id="delete-coll" type="button" class="jsonly" name="data[action]" value="<?=___('Delete Collection')?>"/> + <input id="delete-coll" type="button" class="jsonly" name="data[action]" value="<?=___('Delete Collection', 'collections_edit_formfield_deletecollection')?>"/> <div id="delete-confirm"> <div><input id="delete-coll-noscript" type="checkbox" name="data[action]" value="delete-coll"/> <label for="delete-coll-noscript"><?=___('Yes, I would like to delete this collection.')?></label></div> - <p class="jsonly"><?=sprintf(___('Check the box, then click on "%1$s" to delete this collection.'), ___('Delete Collection'))?></p> + <p class="jsonly"><?=sprintf(___('Check the box, then click on "%1$s" to delete this collection.'), ___('Delete Collection', 'collections_edit_formfield_deletecollection'))?></p> <noscript><p><?=sprintf(___('Check the box, then click on "%1$s" to delete this collection.'), ___('Update Collection'))?></p></noscript> </div> </fieldset> diff --git a/site/app/views/collections/listing.thtml b/site/app/views/collections/listing.thtml index 226f3ee..8fcbfcc 100644 --- a/site/app/views/collections/listing.thtml +++ b/site/app/views/collections/listing.thtml @@ -49,7 +49,7 @@ $this->layout = 'amo2009'; <div class="primary" role="main"> <?=$this->renderElement('amo2009/breadcrumbs')?> <?php if (empty($list_header)): ?> - <h2><?=___('Collections')?></h2> + <h2><?=___('Collections', 'collections_index_header_collections')?></h2> <?php else: ?> <h2><?=$list_header?></h2> <?php endif; ?> diff --git a/site/app/views/collections/subscribe.thtml b/site/app/views/collections/subscribe.thtml index d131f18..e97c621 100644 --- a/site/app/views/collections/subscribe.thtml +++ b/site/app/views/collections/subscribe.thtml @@ -88,7 +88,7 @@ if (!$is_ajax): ?> <div class="footer"> - <?=$html->link(___('Close'), '/collections', + <?=$html->link(___('Close', 'collections_subscribe_button_close'), '/collections', array('class' => 'button close-button'));?> <div class="bother"> <input type="checkbox" id="bothersome" name="bothersome"> diff --git a/site/app/views/compatibility/dashboard.thtml b/site/app/views/compatibility/dashboard.thtml index af32ddc..99e79a0 100644 --- a/site/app/views/compatibility/dashboard.thtml +++ b/site/app/views/compatibility/dashboard.thtml @@ -42,7 +42,7 @@ $this->viewVars['bodyclass'] = 'inverse'; ?> <div id="content" class="primary prose" style="min-height: 400px;"> <div id="compat-home-nav"> - <a href="#" onclick="compatibility.viewHome(); return false;"><?=___('Back to Main')?></a> + <a href="#" onclick="compatibility.viewHome(); return false;"><?=___('Back to Main', 'compatibility_dashboard_main_link')?></a> </div> <div class="compat-box"> <div id="compat-intro"> @@ -59,7 +59,7 @@ $this->viewVars['bodyclass'] = 'inverse'; <div id="report-intro"> <div class="header"> <div class="title"> - <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('Add-on Compatibility Report')?> + <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('Add-on Compatibility Report', 'compatibility_dashboard_report')?> </div> </div> <p class="intro"><?=sprintf(___('Of the %1$s add-ons that make up 95% of add-on usage known to Mozilla, <b>%2$s%</b> are currently considered compatible with the latest builds of %3$s.'), $html->number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p> @@ -97,7 +97,7 @@ $this->viewVars['bodyclass'] = 'inverse'; <div id="report-details"> <div class="header"> <div class="title"> - <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('Add-on Compatibility Report')?> + <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('Add-on Compatibility Report', 'compatibility_dashboard_report')?> </div> </div> <div class="loading"><?=___('Loading data...')?></div> diff --git a/site/app/views/compatibility/report.thtml b/site/app/views/compatibility/report.thtml index 7af4665..444cded 100644 --- a/site/app/views/compatibility/report.thtml +++ b/site/app/views/compatibility/report.thtml @@ -40,7 +40,7 @@ if ($format != 'ajax'): $this->viewVars['bodyclass'] = 'inverse'; ?> <div id="content" class="primary prose" style="min-height: 400px;"> - <h2><?=___('Add-on Compatibility Report')?></h2> + <h2><?=___('Add-on Compatibility Report', 'compatibility_dashboard_report')?></h2> <?php endif; ?> <p class="intro"><?=___('The add-ons below make up 95% of add-on usage known to Mozilla and are ordered by their usage size.')?></p> <table id="compat-report"> diff --git a/site/app/views/developers/addon_edit.thtml b/site/app/views/developers/addon_edit.thtml index f496451..aab1dc4 100644 --- a/site/app/views/developers/addon_edit.thtml +++ b/site/app/views/developers/addon_edit.thtml @@ -43,9 +43,9 @@ <?=$this->renderElement('developers/addonheader', array('title' => sprintf(___('Edit %s'), $addon_name), 'addon_id' => $addon_id));?> <dl id="edit-listing" class="actionbar"> - <dt class="edit-authors"><?=$html->link(___('Manage Add-on Authors'), "/developers/addon/edit/{$addon_id}/authors")?></dt> + <dt class="edit-authors"><?=$html->link(___('Manage Add-on Authors', 'devcp_edit_dt_manage_authors'), "/developers/addon/edit/{$addon_id}/authors")?></dt> <dd><?=___('Add or remove users that can manage this add-on.')?></dd> - <dt class="edit-categories"><?=$html->link(___('Manage Add-on Categories'), "/developers/addon/edit/{$addon_id}/categories")?></dt> + <dt class="edit-categories"><?=$html->link(___('Manage Add-on Categories', 'devcp_edit_dt_manage_categories'), "/developers/addon/edit/{$addon_id}/categories")?></dt> <dd><?=___('Select the relevant categories for each application your add-on supports.')?></dd> <dt class="edit-tags"><?=$html->link(___('Manage Add-on Tags'), "/developers/addon/edit/{$addon_id}/tags")?></dt> <dd><?=___('Add tags to your add-on.')?></dd> diff --git a/site/app/views/developers/addon_edit_authors.thtml b/site/app/views/developers/addon_edit_authors.thtml index 5d086fc..af419da 100644 --- a/site/app/views/developers/addon_edit_authors.thtml +++ b/site/app/views/developers/addon_edit_authors.thtml @@ -47,7 +47,7 @@ echo '<div class="notice-success rounded">'.___('<span>Your changes have been saved.</span><br />Please note that some changes may take several hours to appear in all areas of the website.').'</div>'; } ?> - <h2><?=___('Manage Add-on Authors')?></h2> + <h2><?=___('Manage Add-on Authors', 'devcp_edit_authors_header_manage')?></h2> <?=$this->renderElement('noscript')?> <?=$this->renderElement('developers/rolecheck')?> diff --git a/site/app/views/developers/addon_edit_categories.thtml b/site/app/views/developers/addon_edit_categories.thtml index f5fa2f2..223d632 100644 --- a/site/app/views/developers/addon_edit_categories.thtml +++ b/site/app/views/developers/addon_edit_categories.thtml @@ -46,7 +46,7 @@ echo '<div class="notice-success rounded">'.___('<span>Your changes have been saved.</span><br />Please note that some changes may take several hours to appear in all areas of the website.').'</div>'; } ?> - <h2><?=___('Manage Add-on Categories')?></h2> + <h2><?=___('Manage Add-on Categories', 'devcp_edit_categories_header_manage')?></h2> <?=$this->renderElement('noscript')?> <?=$this->renderElement('developers/rolecheck')?> <?php diff --git a/site/app/views/developers/addon_edit_contributions.thtml b/site/app/views/developers/addon_edit_contributions.thtml index fd7dad2..8fb1476 100644 --- a/site/app/views/developers/addon_edit_contributions.thtml +++ b/site/app/views/developers/addon_edit_contributions.thtml @@ -59,11 +59,11 @@ <?php if ($show_intro): ?> <div id="start-asking" class="graybox field rounded spaced"> - <h2><?=___('Start Asking for Contributions')?></h2> + <h2><?=___('Start Asking for Contributions', 'devcp_edit_contrib_button_start')?></h2> <?=___('<p>Contributions provide a way for users to support your add-on financially. With contributions, you can:</p><ul><li>Ask users for donations on your add-on\'s listing.</li><li>Offer users the ability to contribute using a credit card or PayPal account.</li><li>Deposit contributions in a <a href=\'https://www.paypal.com/\' target=\'_blank\'>PayPal account</a> of your choice.</li></ul><p>Ready to get started? Click below to start asking for contributions.</p>')?> <?php if ($has_profile): ?> <div class="button-holder"> - <button><?=___('Start Asking for Contributions')?></button> + <button><?=___('Start Asking for Contributions', 'devcp_edit_contrib_button_start')?></button> </div> <?php else: ?> <p><strong><?=___('Before you begin, you must create a developer profile.')?></strong></p> @@ -151,7 +151,7 @@ <div class="button-holder"> <?php if ($show_intro): ?> <?=$contribution_toggle?> - <button><?=___('Start Asking for Contributions')?></button> + <button><?=___('Start Asking for Contributions', 'devcp_edit_contrib_button_start')?></button> <?php else: ?> <button><?=___('Update Contributions')?></button> <?php endif; ?> diff --git a/site/app/views/developers/addon_edit_descriptions.thtml b/site/app/views/developers/addon_edit_descriptions.thtml index 761dbc9..7f2c722 100644 --- a/site/app/views/developers/addon_edit_descriptions.thtml +++ b/site/app/views/developers/addon_edit_descriptions.thtml @@ -90,7 +90,7 @@ echo $this->renderElement('translationbox', array( 'field' => 'developercomments', 'translations' => $translations['developercomments'], - 'displayName' => ___('Developer Comments'), + 'displayName' => ___('Developer Comments', 'devcp_edit_descriptions_transbox_comments_name'), 'description' => ___('Any information end users may want to know that isn\'t necessarily applicable to the add-on summary or description. Common uses include listing known major bugs, information on how to report bugs, anticipated release date of a new version, etc.'), )); @@ -108,7 +108,7 @@ 'field' => 'privacypolicy', 'translations' => $translations['privacypolicy'], 'height' => '200', - 'displayName' => ___('Privacy Policy'), + 'displayName' => ___('Privacy Policy', 'devcp_edit_descriptions_transbox_privacy_name'), 'description' => ___('If your add-on has a privacy policy, enter its text here. Your add-on\'s display page will display a link to the policy.'), )); ?> diff --git a/site/app/views/developers/addon_edit_profile.thtml b/site/app/views/developers/addon_edit_profile.thtml index 7159036..9b29de1 100644 --- a/site/app/views/developers/addon_edit_profile.thtml +++ b/site/app/views/developers/addon_edit_profile.thtml @@ -74,10 +74,10 @@ $this->translationBox = array( <?php if (!$has_profile): ?> <div id="create-dev-profile" class="graybox field rounded spaced"> - <h2><?=___('Create a Developer Profile')?></h2> + <h2><?=___('Create a Developer Profile', 'devcp_edit_profile_button_create')?></h2> <?=___('<p>Introduce yourself to your users with a Developer Profile.</p><ul><li>Explain why you created this add-on.</li><li>Tell your users what\'s next.</li><li>Build more awareness of your efforts.</li></ul><p>Ready to create your Developer Profile? Click the button below to begin.</p>')?> <div class="button-holder"> - <button><?=___('Create a Developer Profile')?></button> + <button><?=___('Create a Developer Profile', 'devcp_edit_profile_button_create')?></button> </div> </div> <?php endif; ?> diff --git a/site/app/views/developers/addon_edit_properties.thtml b/site/app/views/developers/addon_edit_properties.thtml index 88892fc..c3c2578 100644 --- a/site/app/views/developers/addon_edit_properties.thtml +++ b/site/app/views/developers/addon_edit_properties.thtml @@ -75,7 +75,7 @@ 'field' => 'name', 'translations' => $translations['name'], 'type' => 'textbox', - 'displayName' => ___('Add-on Name'), + 'displayName' => ___('Add-on Name', 'devcp_edit_properties_transbox_name_name'), 'description' => ___('The name of your add-on is displayed everywhere your add-on is listed.'), )); ?> diff --git a/site/app/views/developers/addon_edit_tags.thtml b/site/app/views/developers/addon_edit_tags.thtml index d43b7ad..a19ca57 100644 --- a/site/app/views/developers/addon_edit_tags.thtml +++ b/site/app/views/developers/addon_edit_tags.thtml @@ -64,7 +64,7 @@ <input type="hidden" name="addonid" id="addtagformaddonid" value="<?=$addon_data['Addon']['id']?>"/> <input type="hidden" name="origin" id="origin" value="developers"/> - <button id="addtagbutton"><?=___('Add');?></button> + <button id="addtagbutton"><?=___('Add', 'tags_add_tag_button');?></button> </form> <span class="hint"><?=___('Comma-separated, minimum of 2 characters. Example: <span class="example">ocean, sail boat, water</span>')?></span> </div> diff --git a/site/app/views/developers/addon_status.thtml b/site/app/views/developers/addon_status.thtml index 194f114..c330f4d 100644 --- a/site/app/views/developers/addon_status.thtml +++ b/site/app/views/developers/addon_status.thtml @@ -55,13 +55,13 @@ <?=$html->hiddenSession();?> <div class="field graybox rounded spaced"> - <h4 class="status"><?=sprintf(___('Add-on Status: %s'), '<span class="status-'.$addon['Addon']['status'].'">'.$statuses[$addon['Addon']['status']].'</span>')?></h4> + <h4 class="status"><?=sprintf(___('Add-on Status: %s', 'devcp_addon_status_header'), '<span class="status-'.$addon['Addon']['status'].'">'.$statuses[$addon['Addon']['status']].'</span>')?></h4> <p> <?php function status_span($i, $status) { return '<span class="status-'.$i.'">'.$status.'</span>'; } // Add-on Status - $sandbox = status_span(STATUS_SANDBOX, ___('Sandbox')); - $public = status_span(STATUS_PUBLIC, ___('Public')); + $sandbox = status_span(STATUS_SANDBOX, ___('Sandbox', 'devcp_addon_status_sandbox')); + $public = status_span(STATUS_PUBLIC, ___('Public', 'devcp_addon_status_public')); switch ($addon['Addon']['status']) { case STATUS_NULL: echo ___('Your add-on is currently <span class="status-0">Incomplete</span>. This means your add-on is not showing up on any portion of the site or update check service. You may come to this page to complete your add-on after it meets the criteria below for completion and transfer to the <span class="status-1">Sandbox</span>.'); diff --git a/site/app/views/developers/dashboard.thtml b/site/app/views/developers/dashboard.thtml index 9193f7e..cd2b70e 100644 --- a/site/app/views/developers/dashboard.thtml +++ b/site/app/views/developers/dashboard.thtml @@ -61,16 +61,16 @@ echo '<ul class="actionbar index-actions">'; // Edit Add-on - echo '<li class="edit"><a href="'.$html->url('/developers/addon/edit/'.$addon_id).'" class="view">'.___('Edit Add-on').'</a>'; + echo '<li class="edit"><a href="'.$html->url('/developers/addon/edit/'.$addon_id).'" class="view">'.___('Edit Add-on', 'devcp_actionbar_link_edit').'</a>'; echo '<span class="action-details">'.sprintf(___('Last edited on %s'), strftime(___('%B %e, %Y'), strtotime($addon['Addon']['modified']))).'</span></li>'; // Change Status - echo '<li class="status"><a href="'.$html->url('/developers/addon/status/'.$addon_id).'" class="view">'.___('Change Status').'</a>'; + echo '<li class="status"><a href="'.$html->url('/developers/addon/status/'.$addon_id).'" class="view">'.___('Change Status', 'devcp_dashboard_change_status').'</a>'; $active = $addon['Addon']['inactive'] == 1 ? ___('Inactive') : ___('Active'); echo '<span class="action-details">'.sprintf(___('%1$s currently %2$s and %3$s'), $addontypes[$addon['Addon']['addontype_id']], '<span class="inactive-'.$addon['Addon']['inactive'].'">'.$active.'</span>', '<span class="status-'.$addon['Addon']['status'].'">'.$statuses[$addon['Addon']['status']].'</span>').'</span></li>'; // Statistics Dashboard - echo '<li class="statistics"><a href="'.$html->url('/statistics/addon/'.$addon_id).'" class="view">'.___('Statistics Dashboard').'</a>'; + echo '<li class="statistics"><a href="'.$html->url('/statistics/addon/'.$addon_id).'" class="view">'.___('Statistics Dashboard', 'devcp_actionbar_link_stats').'</a>'; echo '<span class="action-details stats">'; echo sprintf(___('<em>%s</em> Total Downloads'), $html->number_format($addon['Addon']['totaldownloads'], 0)); echo ' · '; @@ -79,7 +79,7 @@ echo sprintf(___('<em>%s</em> Active Daily Users'), $html->number_format($addon['Addon']['updatepings'], 0)); echo '</span></li>'; // Versions and Files - echo '<li class="versions"><a href="'.$html->url('/developers/versions/'.$addon_id).'" class="view">'.___('Versions and Files').'</a>'; + echo '<li class="versions"><a href="'.$html->url('/developers/versions/'.$addon_id).'" class="view">'.___('Versions and Files', 'devcp_dashboard_versions').'</a>'; echo '<span class="action-details">'; if (!empty($latestVersion)) { echo ___('Latest Version:').' '.$html->link($latestVersion['version'], '/developers/versions/edit/'.$latestVersion['id']).' ('.$this->controller->Amo->describeVersionStatus($latestVersion['File']).')'; @@ -96,7 +96,7 @@ } else { // Admin Disabled Add-on - echo '<p>'.sprintf(___('Add-on Status: %s'), '<span class ="'.STATUS_DISABLED.'">'.$statuses[STATUS_DISABLED].'</span>').'</p>'; + echo '<p>'.sprintf(___('Add-on Status: %s', 'devcp_dashboard_disabled_status'), '<span class ="'.STATUS_DISABLED.'">'.$statuses[STATUS_DISABLED].'</span>').'</p>'; echo '<p>'.sprintf(___('Your add-on was disabled by an administrator and cannot be used. If you have any questions, please email %s.'), 'amo-admins@mozilla.org').'</p>'; } ?> @@ -110,7 +110,7 @@ echo '<div class="graybox rounded">'; echo '<h4>'.___('Welcome to the Developer Dashboard').'</h4>'; echo '<p>'.___('You don\'t currently have any add-ons hosted on Mozilla Add-ons. To learn how the process works and submit your first add-on, click Get Started below.').'</p>'; - echo '<div style="text-align: center;"><a href="'.$html->url('/developers/addon/submit').'" class="action-button rounded">'.___('Get Started').'</a></div>'; + echo '<div style="text-align: center;"><a href="'.$html->url('/developers/addon/submit').'" class="action-button rounded">'.___('Get Started', 'devcp_dashboard_start').'</a></div>'; echo '</div>'; } ?> diff --git a/site/app/views/developers/previews.thtml b/site/app/views/developers/previews.thtml index 4c7f740..4b1a817 100644 --- a/site/app/views/developers/previews.thtml +++ b/site/app/views/developers/previews.thtml @@ -77,7 +77,7 @@ <table style="width: 100%;"><tr><td style="width: 200px; text-align: center; vertical-align: top;"> <img src="<?=$this->controller->Image->getPreviewURL($preview['Preview']['id'])?>/0" alt="<?=___('Thumbnail')?>" /> </td><td style="vertical-align: top;"> - <h5 style="margin-top: 0; margin-bottom: 2px;"><?=___('Preview Caption')?></h5> + <h5 style="margin-top: 0; margin-bottom: 2px;"><?=___('Preview Caption', 'devcp_previews_header_caption')?></h5> <?php echo $this->renderElement('translationbox', array( 'field' => 'caption', @@ -93,7 +93,7 @@ <?=___('Default Preview')?></label> </td><td class="preview-buttons"> <a href="#" onclick="previews.showReplaceBox(this); return false;" class="edit-button rounded"><?=___('Replace Preview')?></a> - <a href="#" onclick="previews.deletePreview(this); return false;" class="remove-button rounded"><?=___('Delete Preview')?></a> + <a href="#" onclick="previews.deletePreview(this); return false;" class="remove-button rounded"><?=___('Delete Preview', 'devcp_previews_a_delete')?></a> </td></tr></table> <div class="replace-preview" style="display: none;"> diff --git a/site/app/views/developers/uploader.thtml b/site/app/views/developers/uploader.thtml index be1ea22..8cc3ab0 100644 --- a/site/app/views/developers/uploader.thtml +++ b/site/app/views/developers/uploader.thtml @@ -65,7 +65,7 @@ <div id="step-intro"> <h3><?=___('How does it all work?')?></h3> <?=___('<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. Hosting your add-on on Mozilla Add-ons is the easiest way to handle distribution of your add-on. Here\'s what you\'ll get:</p><ul><li>Each add-on will have a public display page with information you provide, such as a brief summary of the add-on\'s functionality, an optional longer description, and a showcase of preview screenshots of your add-on.</li><li>Your add-on will appear in search and browse listings across the site, and even in the Add-ons Manager of Firefox 3.</li><li>We\'ll take care of hosting all of your downloads and providing automatic updates to users when you upload a new version.</li><li>You\'ll have access to a statistics dashboard with detailed information about your user base.</li></ul><p>Add-ons hosted on the site must be reviewed by a Mozilla Add-ons Editor before they will have all of the features listed above. If you\'re ready to start the process and have your add-on package ready for upload, just click on Get Started below!</p>')?> - <div style="text-align: center;"><a href="#" onclick="upload.showAgreement(); return false;" class="action-button rounded"><?=___('Get Started')?></a></div> + <div style="text-align: center;"><a href="#" onclick="upload.showAgreement(); return false;" class="action-button rounded"><?=___('Get Started', 'devcp_uploader_a_start')?></a></div> </div> <!-- /#step-intro --> <?php endif; ?> <?php $showAgreement = ($type == 'new' || !$hasAgreement); ?> @@ -125,7 +125,7 @@ <?=(!empty($addon_id) ? '<input type="hidden" name="data[Addon][id]" value="'.$addon_id.'" />' : '')?> <?=(!empty($version_id) ? '<input type="hidden" name="data[Version][id]" value="'.$version_id.'" />' : '')?> <label><?=___('Add-on File: ')?><input id="upload-field" type="file" name="file" /></label><br /> - <?=___('Supported Platforms:')?> <label><input type="radio" name="platformtype" onclick="upload.platformAll();" checked /> <?=___('All')?></label> + <?=___('Supported Platforms:')?> <label><input type="radio" name="platformtype" onclick="upload.platformAll();" checked /> <?=___('All', 'devcp_uploader_platformtype_all')?></label> <label><input type="radio" name="platformtype" onclick="upload.platformSpecific();" /> <?=___('Specific:')?></label> <?php $platforms = $this->controller->Platform->getNames(); diff --git a/site/app/views/developers/versions.thtml b/site/app/views/developers/versions.thtml index 2947449..0f455db 100644 --- a/site/app/views/developers/versions.thtml +++ b/site/app/views/developers/versions.thtml @@ -55,7 +55,7 @@ echo '<tr>'; echo '<th style="width: 25%;">'.___('Version').'</th>'; echo '<th style="width: 20%;">'.___('Validation').'</th>'; - echo '<th style="width: 20%;">'.___('Status').'</th>'; + echo '<th style="width: 20%;">'.___('Status', 'devcp_versions_th_status').'</th>'; echo '<th style="width: 20%;">'.___('Created').'</th>'; echo '<th style="width: 15%;"></th>'; echo '</tr>'; @@ -63,7 +63,7 @@ $i = 0; foreach ($versions as $version) { echo '<tr'.($i % 2 == 0 ? ' class="alt"' : '').'>'; - echo '<td><a href="'.$html->url('/developers/versions/edit/'.$version['Version']['id']).'">'.sprintf(___('Version %s'), $version['Version']['version']).'</a></td>'; + echo '<td><a href="'.$html->url('/developers/versions/edit/'.$version['Version']['id']).'">'.sprintf(___('Version %s', 'devcp_details_version'), $version['Version']['version']).'</a></td>'; echo '<td class="validation"><a href="'.$html->url('/developers/versions/validate/'.$version['Version']['id']).'">'.$this->controller->Amo->describeValidationStatus($version['File']).'</a></td>'; echo '<td>'.$this->controller->Amo->describeVersionStatus($version['File']).'</td>'; echo '<td>'.strftime(___('%B %e, %Y'), strtotime($version['Version']['created'])).'</td>'; @@ -74,11 +74,11 @@ echo '<div class="inline-delete-box">'; echo '<p>'.___('This version has no files associated with it and can be removed. Would you like to remove this version?').'</p><br />'; echo '<p><a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'" class="remove-button rounded">'.___('Remove Empty Version').'</a> '; - echo '<a href="#" onclick="versions.cancelDelete(this); return false;" class="button rounded">'.___('Cancel').'</a></p>'; + echo '<a href="#" onclick="versions.cancelDelete(this); return false;" class="button rounded">'.___('Cancel', 'devcp_versions_a_cancel').'</a></p>'; echo '</div></div>'; } else { - echo '<a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'">'.$html->image('developers/delete.png', array('alt' => ___('Delete Version'), 'title' => ___('Delete Version'))).'</a>'; + echo '<a href="'.$html->url('/developers/versions/delete/'.$version['Version']['id']).'">'.$html->image('developers/delete.png', array('alt' => ___('Delete Version', 'devcp_versions_a_delete'), 'title' => ___('Delete Version', 'devcp_versions_a_delete'))).'</a>'; } echo '</td>'; echo '</tr>'; diff --git a/site/app/views/developers/versions_delete.thtml b/site/app/views/developers/versions_delete.thtml index ac691ae..dd5c5eb 100644 --- a/site/app/views/developers/versions_delete.thtml +++ b/site/app/views/developers/versions_delete.thtml @@ -53,9 +53,9 @@ <li><?=sprintf(n___('%s file', '%s files', count($version['File'])), count($version['File']))?></li> </ul> <div> - <a href="#" onclick="versions_delete.confirm(); return false;" class="remove-button rounded"><?=___('Delete Version')?></a> + <a href="#" onclick="versions_delete.confirm(); return false;" class="remove-button rounded"><?=___('Delete Version', 'devcp_versions_delete_a_delete')?></a> <input type="hidden" name="confirmDelete" value="1"/> - <a href="<?=$html->url('/developers/versions/'.$addon_id)?>" class="button rounded"><?=___('Cancel')?></a> + <a href="<?=$html->url('/developers/versions/'.$addon_id)?>" class="button rounded"><?=___('Cancel', 'devcp_versions_delete_a_cancel')?></a> </div> </div> </form> diff --git a/site/app/views/developers/versions_edit.thtml b/site/app/views/developers/versions_edit.thtml index b27d6ff..119cf2d 100644 --- a/site/app/views/developers/versions_edit.thtml +++ b/site/app/views/developers/versions_edit.thtml @@ -76,9 +76,9 @@ echo '<table id="files-table" class="pretty-table">'; echo '<thead><tr>'; echo '<th>'.___('File').'</th>'; - echo '<th>'.___('Platform').'</th>'; + echo '<th>'.___('Platform', 'devcp_versions_edit_th_platform').'</th>'; echo '<th>'.___('Size').'</th>'; - echo '<th>'.___('Status').'</th>'; + echo '<th>'.___('Status', 'devcp_versions_edit_th_status').'</th>'; echo '<th style="width: 25px;"></th>'; echo '</tr></thead><tbody>'; $i = 0; @@ -95,11 +95,11 @@ echo '<td>'.sprintf(___('%1$s KB'), $file['size']).'</td>'; echo '<td>'.$statuses[$file['status']].'</td>'; echo '<td><div class="inline-delete-button uses-image">'; - echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => ___('Delete File'), 'title' => ___('Delete File'))).'</a>'; + echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => ___('Delete File', 'devcp_versions_edit_a_delete'), 'title' => ___('Delete File', 'devcp_versions_edit_a_delete'))).'</a>'; echo '<div class="inline-delete-box">'; echo '<p>'.___('Are you <b>sure</b> you wish to permanently delete this file?').'</p><br />'; - echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">'.___('Delete File').'</a> '; - echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">'.___('Cancel').'</a></p>'; + echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">'.___('Delete File', 'devcp_versions_edit_a_delete').'</a> '; + echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">'.___('Cancel', 'devcp_versions_edit_a_cancel').'</a></p>'; echo '</div>'; echo '</div></td>'; echo '</tr>'; @@ -148,11 +148,11 @@ echo '</select></td>'; echo '<td style="width: 25px;">'; echo '<div class="inline-delete-button uses-image">'; - echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => ___('Remove Application Compatibility'), 'title' => ___('Remove Application Compatibility'))).'</a>'; + echo '<a href="#" onclick="versions_edit.deleteVersion(this); return false;">'.$html->image('developers/delete.png', array('alt' => ___('Remove Application Compatibility', 'devcp_versions_edit_remove_compat'), 'title' => ___('Remove Application Compatibility', 'devcp_versions_edit_remove_compat'))).'</a>'; echo '<div class="inline-delete-box">'; echo '<p>'.___('Are you <b>sure</b> you wish to remove compatibility with this application?').'</p><br />'; echo '<p><a href="#" onclick="versions_edit.confirmDelete(this); return false;" class="remove-button rounded">'.___('Remove Application').'</a> '; - echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">'.___('Cancel').'</a></p>'; + echo '<a href="#" onclick="versions_edit.cancelDelete(this); return false;" class="button rounded">'.___('Cancel', 'devcp_versions_edit_a_cancel').'</a></p>'; echo '</div>'; echo '</div></td>'; @@ -179,7 +179,7 @@ 'translations' => $translations['releasenotes'], 'height' => '130', 'width' => 'inherit', - 'displayName' => ___('Release Notes'), + 'displayName' => ___('Release Notes', 'devcp_versions_edit_transbox_releasenotes_name'), 'description' => ___('Information about changes in this release, new features, known bugs, and other useful information specific to this release/version. This information will also be available to users updating the add-on in the Firefox 3 Add-ons Manager interface.'), )); ?> diff --git a/site/app/views/editors/featured.thtml b/site/app/views/editors/featured.thtml index 6a627a1..167d72a 100644 --- a/site/app/views/editors/featured.thtml +++ b/site/app/views/editors/featured.thtml @@ -51,7 +51,7 @@ var featureeditsuccess = '<?php echo ___('Successfully edited feature.'); ?>'; var featureremovefailure = '<?php echo ___('Failed to remove feature.'); ?>'; var addedinvalidlocale = '<?php echo ___('One or more locales are invalid.'); ?>'; - var featureeditsubmit = '<?php echo ___('Go'); ?>'; + var featureeditsubmit = '<?php echo ___('Go', 'editors_featured_edit_feature_submit'); ?>'; </script> <div id="content"> @@ -60,7 +60,7 @@ <div id="content-main"> <table width="100%" id="features"> <tr class="queueHeader"> - <td><?=___('Add-on')?></td> + <td><?=___('Add-on', 'editors_th_addon')?></td> <td><?=___('Restrict to locales?')?></td> </tr> <?php @@ -104,7 +104,7 @@ echo $html->hidden('Category/id', array('value' => $category['Category']['id'])); echo $html->hidden('Addon/id', array('value' => $addon['Addon']['id'])); echo $html->input('AddonCategory/feature_locales', array('id' => "edit-addon-locales-{$category['Category']['id']}-{$addon['Addon']['id']}", 'size' => 40, 'value' => $addon['AddonCategory'][0]['feature_locales'])); - echo $html->submit(___('Go'), array('id' => 'edit-feature-submit-'.$category['Category']['id'].'-'.$addon['Addon']['id'])); + echo $html->submit(___('Go', 'editors_featured_edit_feature_submit'), array('id' => 'edit-feature-submit-'.$category['Category']['id'].'-'.$addon['Addon']['id'])); ?> </form> </td> @@ -123,7 +123,7 @@ 'id' => 'add-'.$category['Category']['id'], )).' '; echo '<input type="text" name="data[Addon][id]" id="new-addon-id-'.$category['Category']['id'].'" onfocus="prepAutocomplete('.$category['Category']['id'].');" size="40" />'; - echo '<noscript>'.$html->submit(___('Add'), array('id' => 'new-feature-submit-'.$category['Category']['id'])).'</noscript>'; + echo '<noscript>'.$html->submit(___('Add', 'editors_featured_add_feature_submit'), array('id' => 'new-feature-submit-'.$category['Category']['id'])).'</noscript>'; echo '</form></td>'; echo '<td><span id="edit-feature-message-'.$category['Category']['id'].'"></span></td></tr>'; // use the extra space for messages diff --git a/site/app/views/editors/logs.thtml b/site/app/views/editors/logs.thtml index 5dcee3f..dae105e 100644 --- a/site/app/views/editors/logs.thtml +++ b/site/app/views/editors/logs.thtml @@ -39,7 +39,7 @@ <?=$this->renderElement('developers/editorsmenu');?> <div id="content-main"> - <h3><?=___('Event Log')?></h3> + <h3><?=___('Event Log', 'editorcp_logs_page_heading')?></h3> <form id="logFilter" method="get" action=""> <div> <?=sprintf(___('View entries between %1$s and %2$s'), @@ -53,7 +53,7 @@ <option value="<?=$val?>"<?=($filter == $val ? ' selected="selected"' : '')?>><?=$text?></option> <?php endforeach; ?> </select> - <?=$html->submit(___('Filter'))?> + <?=$html->submit(___('Filter', 'editorcp_logs_button_filter'))?> </div> </form> <?php diff --git a/site/app/views/editors/performance_charts.thtml b/site/app/views/editors/performance_charts.thtml index 7f553c7..2453d10 100644 --- a/site/app/views/editors/performance_charts.thtml +++ b/site/app/views/editors/performance_charts.thtml @@ -62,7 +62,7 @@ <?php if ($showUserLookup): ?> <input type="hidden" name="user" value="<?=$user['User']['email']?>" /> <?php endif; ?> - <?=$html->submit(___('Filter'))?> + <?=$html->submit(___('Filter', 'editorcp_reviewlog_button_filter'))?> </div> </form> <div id="performancePieContainer"> diff --git a/site/app/views/editors/performance_table.thtml b/site/app/views/editors/performance_table.thtml index 9e97540..6496aab 100644 --- a/site/app/views/editors/performance_table.thtml +++ b/site/app/views/editors/performance_table.thtml @@ -49,7 +49,7 @@ '<input type="text" id="start" name="start" value="'.$startDate.'" size="11" onfocus="clearInput(this)"/>', '<input type="text" id="end" name="end" value="'.$endDate.'" size="11" onfocus="clearInput(this)"/>'); echo " "; - echo $html->submit(___('Filter')); + echo $html->submit(___('Filter', 'editorcp_reviewlog_button_filter')); if ($showUserLookup) { echo '<input type="hidden" name="user" value="'.$user['User']['email'].'"/>'; } @@ -65,11 +65,11 @@ <table id="historyTable"> <thead title="<?=___('Shift-click to sort by multiple columns')?>"> <tr> - <th><?=___('Date')?></th> - <th><?=___('Add-on')?></th> - <th><?=___('Application')?></th> + <th><?=___('Date', 'editorcp_reviewlog_column_date')?></th> + <th><?=___('Add-on', 'editorcp_reviewlog_column_addon')?></th> + <th><?=___('Application', 'editorcp_performance_column_application')?></th> <th><?=___('Category')?></th> - <th><?=___('Action')?></th> + <th><?=___('Action', 'editorcp_reviewlog_column_action')?></th> </tr> </thead> <tbody> @@ -89,7 +89,7 @@ echo ___('Nomination Denied/Sandbox'); } elseif ($approval['Approval']['action'] == STATUS_NOMINATED) { - echo ___('Admin Review'); + echo ___('Admin Review', 'editors_review_history_nominated_adminreview'); } } elseif ($approval['Approval']['reviewtype'] == 'pending') { @@ -100,7 +100,7 @@ echo ___('Denied/Sandbox'); } elseif ($approval['Approval']['action'] == STATUS_PENDING) { - echo ___('Admin Review'); + echo ___('Admin Review', 'editors_review_history_nominated_adminreview'); } } echo '</td>'; diff --git a/site/app/views/editors/queue.thtml b/site/app/views/editors/queue.thtml index f4665d2..1254dbc 100644 --- a/site/app/views/editors/queue.thtml +++ b/site/app/views/editors/queue.thtml @@ -53,7 +53,7 @@ </div> <div> - <label for="FilterApplication"><?=___('Application')?></label> + <label for="FilterApplication"><?=___('Application', 'editors_queue_filter_label_application')?></label> <?=$html->selectTag('Filter/Application', $applications, $selected['Application'], null, null, true)?> </div> @@ -86,7 +86,7 @@ </div> </div> <div class="buttons"> - <?=$html->submit(___('Filter'), array('name' => 'filter'));?> + <?=$html->submit(___('Filter', 'editors_queue_submit_filter'), array('name' => 'filter'));?> <?=$html->submit(___('Clear'), array('name' => 'clear'))?> </div> </div> @@ -112,7 +112,7 @@ $sorturl .= '&dir=asc'; } } - echo $html->link(___('Add-on'), $sorturl); + echo $html->link(___('Add-on', 'editors_th_addon'), $sorturl); echo $sortimg; ?></td> <td><?php @@ -128,7 +128,7 @@ $sorturl .= '&dir=asc'; } } - echo $html->link(___('Type'), $sorturl); + echo $html->link(___('Type', 'editors_th_addontype'), $sorturl); echo $sortimg; ?></td> <?php @@ -174,7 +174,7 @@ } echo '<td>'.(($mode == 'nominated') ? $addon['nominationage'] : $addon['age']).'</td>'; if ($addon['Addon']['adminreview']) { - echo '<td>'.$html->image('developers/admin_review.png', array('title' => ___('Admin Review'))).'</td>'; + echo '<td>'.$html->image('developers/admin_review.png', array('title' => ___('Admin Review', 'editors_flag_admin_review'))).'</td>'; } else { echo '<td> </td>'; } diff --git a/site/app/views/editors/review.thtml b/site/app/views/editors/review.thtml index 22eafd8..1582a21 100644 --- a/site/app/views/editors/review.thtml +++ b/site/app/views/editors/review.thtml @@ -116,9 +116,9 @@ <ul id="flags"> <?php if ($addon['Addon']['adminreview']) { - echo '<li>'.$html->image('developers/admin_review.png', array('title' => ___('Admin Review'))).'</li>'; + echo '<li>'.$html->image('developers/admin_review.png', array('title' => ___('Admin Review', 'editors_review_admin_flag'))).'</li>'; } else { - echo '<li>' . ___('none') . '</li>'; + echo '<li>' . ___('none', 'editors_review_list_none') . '</li>'; } ?> </ul> @@ -158,11 +158,11 @@ <br class="clear"> <div id="links"> <span id="overview_link"><?=$html->link(___('Item Overview'), '/addon/'.$addon['Addon']['id'])?></span> - <span id="history_link"><a href="#history"><?=___('Item History')?></a></span> - <span id="previews_link"><a href="#previews"><?=___('Previews')?></a></span> + <span id="history_link"><a href="#history"><?=___('Item History', 'editors_review_a_item_history')?></a></span> + <span id="previews_link"><a href="#previews"><?=___('Previews', 'editors_review_a_previews')?></a></span> <?=(!empty($addon['Addon']['homepage'])) ? '<span id="homepage_link">'.$html->link(___('Item Homepage'), $addon['Addon']['homepage']).'</span>' : ''?> <?=($this->controller->SimpleAcl->actionAllowed('Admin', 'EditAnyAddon', $this->controller->Session->read('User'))) ? '<span id="edit_link">'.$html->link(___('Edit Item'), '/developers/edit/'.$addon['Addon']['id']).'</span>' : ''?> - <span id="comments_link"><a href="#editorComments"><?=___('Editor Comments')?></a></span> + <span id="comments_link"><a href="#editorComments"><?=___('Editor Comments', 'editors_review_a_comments')?></a></span> </div> <div id="form"> <?php @@ -258,7 +258,7 @@ if (!empty($version['Version']['approvalnotes'])) { echo '</div>'; } if (!empty($addon['Translation']['summary']['string'])) { - echo '<h3>'.___('Summary').'</h3>'; + echo '<h3>'.___('Summary', 'editors_review_header_summary').'</h3>'; echo '<div id="summary" '.$addon['Translation']['summary']['locale_html'].'>'; echo nl2br($addon['Translation']['summary']['string']); echo '</div>'; @@ -282,13 +282,13 @@ if (!empty($addon['Translation']['eula']['string'])) { echo '</div>'; } if (!empty($addon['Translation']['privacypolicy']['string'])) { - echo '<h3>'.___('Privacy Policy').'</h3>'; + echo '<h3>'.___('Privacy Policy', 'editors_review_header_privacy').'</h3>'; echo '<div id="privacyPolicy" '.$addon['Translation']['privacypolicy']['locale_html'].'>'; echo nl2br($addon['Translation']['privacypolicy']['string']); echo '</div>'; } if (!empty($addon['Translation']['developercomments']['string'])) { - echo '<h3>'.___('Developer Comments').'</h3>'; + echo '<h3>'.___('Developer Comments', 'editors_review_header_devcomments').'</h3>'; echo '<div id="developerComments" '.$addon['Translation']['developercomments']['locale_html'].'>'; echo nl2br($addon['Translation']['developercomments']['string']); echo '</div>'; @@ -298,7 +298,7 @@ if (!empty($addon['Translation']['developercomments']['string'])) { <br class="clear"> <div id="validation" class="validation"> <div class="sectionHeader"> - <div class="name"><a name="validation"></a><?=___('Validation Results') . ' [' . $html->link(___('help'), '/pages/validation') . ']'?></div> + <div class="name"><a name="validation"></a><?=___('Validation Results') . ' [' . $html->link(___('help', 'editors_review_header_validation_help'), '/pages/validation') . ']'?></div> <div class="top"><a href="#top"><?=___('Top')?></a></div> </div> <br class="clear"> @@ -310,16 +310,16 @@ if (!empty($addon['Translation']['developercomments']['string'])) { <br class="clear"> <div id="history"> <div class="sectionHeader"> - <div class="name"><a name="history"></a><?=___('Item History')?></div> + <div class="name"><a name="history"></a><?=___('Item History', 'editors_review_a_item_history')?></div> <div class="top"><a href="#top"><?=___('Top')?></a></div> </div> <br class="clear"> <table id="historyTable"> <tr id="headerRow"> <td><?=___('Version/File')?></td> - <td><?=___('Date')?></td> + <td><?=___('Date', 'editors_review_th_date')?></td> <td><?=___('Reviewer')?></td> - <td><?=___('Action')?></td> + <td><?=___('Action', 'editors_review_th_action')?></td> <td><?=___('Comments')?></td> </tr> <?php @@ -338,7 +338,7 @@ if (!empty($addon['Translation']['developercomments']['string'])) { <br class="clear"> <div id="previews"> <div class="sectionHeader"> - <div class="name"><a name="previews"></a><?=___('Previews')?></div> + <div class="name"><a name="previews"></a><?=___('Previews', 'editors_review_a_previews')?></div> <div class="top"><a href="#top"><?=___('Top')?></a></div> </div> <br class="clear"> @@ -356,7 +356,7 @@ if (!empty($addon['Translation']['developercomments']['string'])) { <br class="clear"> <div id="editorComments"> <div class="sectionHeader"> - <div class="name"><a name="editorComments"></a><?=___('Editor Comments')?></div> + <div class="name"><a name="editorComments"></a><?=___('Editor Comments', 'editors_review_a_comments')?></div> <div class="top"><a href="#top"><?=___('Top')?></a></div> </div> <br class="clear"> @@ -386,16 +386,16 @@ if (!empty($addon['Translation']['developercomments']['string'])) { <?=$html->formTag('/editors/review/'.$version['Version']['id'].($queueRank ? "?num={$queueRank}" : ''), 'post', array('id'=>'editorCommentForm', 'class'=>'hidden'))?> <div> <?=$html->input('Versioncomment/subject', array('size'=>'50'))?> - <label for="VersioncommentSubject"><?=___('Subject')?></label><br /> + <label for="VersioncommentSubject"><?=___('Subject', 'editors_review_label_subject')?></label><br /> <?=$html->textarea('Versioncomment/comment', array('cols'=>'70', 'rows'=>'10'))?><br /> <?=$html->hidden('Versioncomment/reply_to', array('value'=>''))?> <input type="submit" value="<?=___('Post Comment')?>" /> - <input type="button" value="<?=___('Cancel')?>" id="VersioncommentCancel" /> + <input type="button" value="<?=___('Cancel', 'editors_review_input_cancel')?>" id="VersioncommentCancel" /> </div> <div id="markitupHelp" class="hidden"> - <span id="markitupHelpClose"><?=$html->image('developers/cross.png', array('alt'=>___('Close'), 'title'=>___('Close')))?></span> + <span id="markitupHelpClose"><?=$html->image('developers/cross.png', array('alt'=>___('Close', 'editors_review_help_close'), 'title'=>___('Close', 'editors_review_help_close')))?></span> <h1><?=___('Comment Help')?></h1> diff --git a/site/app/views/editors/reviewlog.thtml b/site/app/views/editors/reviewlog.thtml index 5bf9353..c56da59 100644 --- a/site/app/views/editors/reviewlog.thtml +++ b/site/app/views/editors/reviewlog.thtml @@ -39,23 +39,23 @@ <?=$this->renderElement('developers/editorsmenu');?> <div id="content-main"> - <h3><?=___('Review Log')?></h3> + <h3><?=___('Review Log', 'editorcp_reviewlog_page_heading')?></h3> <form action="<?=$html->url()?>" method="get"> <?php echo sprintf(___('View entries between %1$s and %2$s'), '<input type="text" id="start" name="start" value="'.$startdate.'" size="11" onFocus="clearInput(this)"/>', '<input type="text" id="end" name="end" value="'.$enddate.'" size="11" onFocus="clearInput(this)"/>'); echo ' '; - echo $html->submit(___('Filter')); + echo $html->submit(___('Filter', 'editorcp_reviewlog_button_filter')); ?> </form> <table id="historyTable"> <tr id="headerRow"> - <td><?=___('Date')?></td> - <td><?=___('Add-on')?></td> + <td><?=___('Date', 'editorcp_reviewlog_column_date')?></td> + <td><?=___('Add-on', 'editorcp_reviewlog_column_addon')?></td> <td><?=___('Editor')?></td> - <td><?=___('Action')?></td> + <td><?=___('Action', 'editorcp_reviewlog_column_action')?></td> <td> </td> </tr> <?php @@ -74,7 +74,7 @@ echo ___('Nomination Denied/Sandbox'); } elseif ($approval['Approval']['action'] == STATUS_NOMINATED) { - echo ___('Admin Review'); + echo ___('Admin Review', 'editors_review_history_nominated_adminreview'); } } elseif ($approval['Approval']['reviewtype'] == 'pending') { @@ -85,7 +85,7 @@ echo ___('Denied/Sandbox'); } elseif ($approval['Approval']['action'] == STATUS_PENDING) { - echo ___('Admin Review'); + echo ___('Admin Review', 'editors_review_history_nominated_adminreview'); } } echo '</td>'; diff --git a/site/app/views/editors/reviews_queue.thtml b/site/app/views/editors/reviews_queue.thtml index 7a61b58..43fb4a9 100644 --- a/site/app/views/editors/reviews_queue.thtml +++ b/site/app/views/editors/reviews_queue.thtml @@ -97,7 +97,7 @@ </ul> <div class="reviewAction"> - <b><?=___('Action')?></b>: + <b><?=___('Action', 'editors_reviews_header_action')?></b>: <input type="radio" name="data[Reviews][review<?=$review['Review']['id']?>]" value="skip" checked id="skip<?=$review['Review']['id']?>"> <label for="skip<?=$review['Review']['id']?>"><?=___('Skip')?></label> <input type="radio" name="data[Reviews][review<?=$review['Review']['id']?>]" value="approve" id="approve<?=$review['Review']['id']?>"> diff --git a/site/app/views/editors/summary.thtml b/site/app/views/editors/summary.thtml index ecfb8c3..53b0805 100644 --- a/site/app/views/editors/summary.thtml +++ b/site/app/views/editors/summary.thtml @@ -39,7 +39,7 @@ <?=$this->renderElement('developers/editorsmenu');?> <div id="content-main"> - <h3><?=___('Editor Summary')?></h3> + <h3><?=___('Editor Summary', 'editorcp_summary_page_heading')?></h3> <table class="stats"> <tr> <td class="heading" colspan=2><?=___('Total Reviews')?></td> diff --git a/site/app/views/elements/addon_categories.thtml b/site/app/views/elements/addon_categories.thtml index 2ace864..b2cc57b 100644 --- a/site/app/views/elements/addon_categories.thtml +++ b/site/app/views/elements/addon_categories.thtml @@ -49,10 +49,10 @@ if (!empty($categories)) { switch ($categories[0]['Category']['addontype_id']) { case ADDON_DICT: case ADDON_LPAPP: - $li = $html->link(___('Dictionaries & Language Packs'), '/browse/type:'.ADDON_DICT); + $li = $html->link(___('Dictionaries & Language Packs', 'nav_category_dicts_langpacks'), '/browse/type:'.ADDON_DICT); break; case ADDON_THEME: - $li = $html->link(___('Themes'), '/browse/type:'.ADDON_THEME); + $li = $html->link(___('Themes', 'nav_category_themes'), '/browse/type:'.ADDON_THEME); break; default: $li = ''; diff --git a/site/app/views/elements/addon_list_options.thtml b/site/app/views/elements/addon_list_options.thtml index 33da7e1..17bc7db 100644 --- a/site/app/views/elements/addon_list_options.thtml +++ b/site/app/views/elements/addon_list_options.thtml @@ -42,10 +42,10 @@ */ $sortorders = array( - 'name' => ___('Add-on Name'), - 'updated' => ___('Date'), - 'popular' => ___('Downloads'), - 'rated' => ___('Rating') + 'name' => ___('Add-on Name', 'list_sortby_name'), + 'updated' => ___('Date', 'list_sortby_date'), + 'popular' => ___('Downloads', 'list_sortby_downloads'), + 'rated' => ___('Rating', 'list_sortby_rating') ); // make sort order links @@ -106,5 +106,5 @@ function submit_options() { </p> <div><button type="submit" name="sort" value="<?=$paging['sortBy']?>" - id="options-submit" class="hidden"><?=___('Go')?></button></div> + id="options-submit" class="hidden"><?=___('Go', 'addons_options_submit')?></button></div> </form> diff --git a/site/app/views/elements/addon_tags.thtml b/site/app/views/elements/addon_tags.thtml index 7a443cb..8cf2213 100644 --- a/site/app/views/elements/addon_tags.thtml +++ b/site/app/views/elements/addon_tags.thtml @@ -60,7 +60,7 @@ <li id="taglink-<?=$t['id']?>" class="<?=$class?>"> <a href="<?=$html->url('/tag/'.$t['tag_text'])?>" class="tagitem"><?=$t['tag_text']?></a> <?php if (@$t['OwnerOrDeveloper'] == 1): ?> - <input type="submit" alt="<?=___('Remove')?>" + <input type="submit" alt="<?=___('Remove', 'tags_alt_remove_tag')?>" name="tagid" value="<?=$t['id']?>" class="removetag" /> <?php endif; ?> diff --git a/site/app/views/elements/addon_version_detail.thtml b/site/app/views/elements/addon_version_detail.thtml index 6d01de8..9d991c0 100644 --- a/site/app/views/elements/addon_version_detail.thtml +++ b/site/app/views/elements/addon_version_detail.thtml @@ -48,7 +48,7 @@ $created = strtotime(str_replace('-', '-', $created)); if (!isset($fileSize) || false === $fileSize = $localization->localFileSize($fileSize)) $fileSize = ''; ?> -<?=$html->link(sprintf(___('Version %s'), $version), "/addons/versions/{$addonid}#version-{$version}", +<?=$html->link(sprintf(___('Version %s', 'addon_display_header_version'), $version), "/addons/versions/{$addonid}#version-{$version}", array('title'=>___('Permanent link to this version')))?> <span title="<?=strftime(___('%B %e, %Y, %I:%M %p'), $created)?>">— <?=strftime(___('%B %e, %Y'), $created)?></span> — <?=$fileSize?> diff --git a/site/app/views/elements/amo2009/addons/list_options.thtml b/site/app/views/elements/amo2009/addons/list_options.thtml index bd88724..6c42879 100644 --- a/site/app/views/elements/amo2009/addons/list_options.thtml +++ b/site/app/views/elements/amo2009/addons/list_options.thtml @@ -42,10 +42,10 @@ */ $sortorders = array( - 'name' => ___('Add-on Name'), - 'updated' => ___('Date'), - 'popular' => ___('Downloads'), - 'rated' => ___('Rating') + 'name' => ___('Add-on Name', 'list_sortby_name'), + 'updated' => ___('Date', 'list_sortby_date'), + 'popular' => ___('Downloads', 'list_sortby_downloads'), + 'rated' => ___('Rating', 'list_sortby_rating') ); // get base URL for sort links and form @@ -110,7 +110,7 @@ $(document).ready(function() { <noscript> <div> <button type="submit" name="sort" value="<?=$paging['sortBy']?>" - id="options-submit"><?=___('Go')?></button> + id="options-submit"><?=___('Go', 'addons_options_submit')?></button> </div> </noscript> </li> diff --git a/site/app/views/elements/amo2009/addons/version_detail.thtml b/site/app/views/elements/amo2009/addons/version_detail.thtml index 67bf772..2ccf90c 100644 --- a/site/app/views/elements/amo2009/addons/version_detail.thtml +++ b/site/app/views/elements/amo2009/addons/version_detail.thtml @@ -48,6 +48,6 @@ $created = strtotime(str_replace('-', '-', $created)); if (!isset($fileSize) || false === $fileSize = $localization->localFileSize($fileSize)) $fileSize = ''; ?> -<?=$html->link(sprintf(___('Version %s'), $version), "/addons/versions/{$addonid}#version-{$version}", +<?=$html->link(sprintf(___('Version %s', 'addon_display_header_version'), $version), "/addons/versions/{$addonid}#version-{$version}", array('title'=>___('Permanent link to this version')))?> — <?=strftime(___('%B %e, %Y'), $created)?> — <?=$fileSize?> diff --git a/site/app/views/elements/amo2009/categories.thtml b/site/app/views/elements/amo2009/categories.thtml index bb66a9e..1743b76 100644 --- a/site/app/views/elements/amo2009/categories.thtml +++ b/site/app/views/elements/amo2009/categories.thtml @@ -39,7 +39,7 @@ ?> <div class="categories"> <h3 title="<?=___('Choose a category')?>"> - <a href="#categoriesdropdown" aria-haspopup="true"><?=___('Categories')?></a> + <a href="#categoriesdropdown" aria-haspopup="true"><?=___('Categories', 'categories_header')?></a> </h3> <ul id="categoriesdropdown"> <li> @@ -62,7 +62,7 @@ <li> <ul> <li> - <?= $html->link(___('Collections'), '/collections/') ?> + <?= $html->link(___('Collections', 'addons_home_collections'), '/collections/') ?> </li> <?php foreach ($AmoCategories as $_category): ?> <?php if (0!==$_category['cat'] || ADDON_PLUGIN===$_category['type']) continue ?> diff --git a/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml b/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml index d1ea5c8..4af16e7 100644 --- a/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml +++ b/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml @@ -49,7 +49,7 @@ $showSecondBox = isset($showSecondBox) ? $showSecondBox : true; <? if ($showCreateLink): ?> <p> <a class="more-info" href="<?=$html->url('/collections/add')?>"> - <?=___('Create a Collection')?> + <?=___('Create a Collection', 'collections_index_a_create')?> </a> </p> <? endif; ?> @@ -57,7 +57,7 @@ $showSecondBox = isset($showSecondBox) ? $showSecondBox : true; <? endif; ?> <? if ($showSecondBox && (APP_ID == APP_FIREFOX)): ?> <div class="highlight"> - <h3><?=___('Add-on Collector')?></h3> + <h3><?=___('Add-on Collector', 'collections_index_header_collector')?></h3> <p class="teaser-img"> <a href="<?=$html->url('/pages/collector')?>"> <img alt="" src="<?=$html->url('/img/amo2009/illustrations/logo-collections-download-146x159.png', diff --git a/site/app/views/elements/amo2009/collections/sort_form.thtml b/site/app/views/elements/amo2009/collections/sort_form.thtml index bbee1a4..87f6bae 100644 --- a/site/app/views/elements/amo2009/collections/sort_form.thtml +++ b/site/app/views/elements/amo2009/collections/sort_form.thtml @@ -52,6 +52,6 @@ <option value="<?=$value?>" <?=$selected?>><?=$opt['text']?></option> <?php endforeach; ?> </select> - <button><?=___('Go')?></button> + <button><?=___('Go', 'collections_index_button_go')?></button> </div> </form> diff --git a/site/app/views/elements/amo2009/contribution.thtml b/site/app/views/elements/amo2009/contribution.thtml index fccd983..a69d1ca 100644 --- a/site/app/views/elements/amo2009/contribution.thtml +++ b/site/app/views/elements/amo2009/contribution.thtml @@ -89,7 +89,7 @@ $has_suggested = !empty($addon['Addon']['suggested_amount']); <?php endif; ?> <p> <a class="toggle-help" href="#contribute-why"> - <?=___('What\'s this?')?> + <?=___('What\'s this?', 'addons_display_a_license_what')?> </a> </p> </div> diff --git a/site/app/views/elements/amo2009/homepage_addon_listing.thtml b/site/app/views/elements/amo2009/homepage_addon_listing.thtml index 8f9315a..82fa2f3 100644 --- a/site/app/views/elements/amo2009/homepage_addon_listing.thtml +++ b/site/app/views/elements/amo2009/homepage_addon_listing.thtml @@ -46,28 +46,28 @@ foreach ($featured_addons as $addon) { <?php if ('popular' == $featured_type): ?> <div class="popular listing-footer"> <a href="<?=$html->url('/browse/type:1/cat:all/format:rss?sort=popular')?>" - class="subscribe"><?=___('Subscribe')?></a> + class="subscribe"><?=___('Subscribe', 'addons_home_browse_subscribe')?></a> <a href="<?=$html->url("/browse/type:1/cat:all?sort=popular")?>" class="more-info" title="<?=___('View all popular add-ons')?>"><?=___('View all popular add-ons')?></a> </div> <?php elseif ('added' == $featured_type): ?> <div class="added listing-footer"> <a href="<?=$html->url('/browse/type:1/cat:all/format:rss?sort=newest')?>" - class="subscribe"><?=___('Subscribe')?></a> + class="subscribe"><?=___('Subscribe', 'addons_home_browse_subscribe')?></a> <a href="<?=$html->url("/browse/type:1/cat:all?sort=newest")?>" class="more-info" title="<?=___('View all newly created add-ons')?>"><?=___('View all newly created add-ons')?></a> </div> <?php elseif ('updated' == $featured_type): ?> <div class="updated listing-footer"> <a href="<?=$html->url('/browse/type:1/cat:all/format:rss?sort=updated')?>" - class="subscribe"><?=___('Subscribe')?></a> + class="subscribe"><?=___('Subscribe', 'addons_home_browse_subscribe')?></a> <a href="<?=$html->url("/browse/type:1/cat:all?sort=updated")?>" class="more-info" title="<?=___('View all recently updated add-ons')?>"><?=___('View all recently updated add-ons')?></a> </div> <?php else: ?> <div class="recommended listing-footer"> <a href="<?=$html->url('/recommended/format:rss')?>" - class="subscribe"><?=___('Subscribe')?></a> + class="subscribe"><?=___('Subscribe', 'addons_home_browse_subscribe')?></a> <a href="<?=$html->url('/recommended')?>" class="more-info" title="<?=___('View all recommended add-ons')?>"><?=___('View all recommended add-ons')?></a> </div> diff --git a/site/app/views/elements/amo2009/search.thtml b/site/app/views/elements/amo2009/search.thtml index e8bee94..6072834 100644 --- a/site/app/views/elements/amo2009/search.thtml +++ b/site/app/views/elements/amo2009/search.thtml @@ -94,7 +94,7 @@ if(!isset($hver)) { // AmoPlatforms is from controller->beforeRender() array_shift($AmoPlatforms); // get rid of PLATFORM_ALL -$platforms = array_merge(array(PLATFORM_ANY => ___('Any')), $AmoPlatforms); //add semantically happy PLATFORM_ANY +$platforms = array_merge(array(PLATFORM_ANY => ___('Any', 'advanced_search_form_any_type')), $AmoPlatforms); //add semantically happy PLATFORM_ANY $pid = 0; if (isset($this->params['pid']) && in_array($this->params['pid'], array_keys($platforms))) { @@ -107,7 +107,7 @@ if (isset($this->params['pid']) // goes to a static page and the latter is empty array_pop($AmoAddonTypes); array_pop($AmoAddonTypes); -$addon_types = array_merge(array(ADDON_ANY => ___('Any')), $AmoAddonTypes); +$addon_types = array_merge(array(ADDON_ANY => ___('Any', 'advanced_search_form_any_type')), $AmoAddonTypes); if (!isset($atype)) { $atype = ADDON_ANY; } @@ -142,10 +142,10 @@ if (isset($this->params['lup']) $sort_orders = array( '' => ___('Keyword Match'), - 'newest' => ___('Newest'), - 'name' => ___('Name'), - 'averagerating' => ___('Rating'), - 'weeklydownloads' => ___('Popularity') + 'newest' => ___('Newest', 'advanced_search_form_newest'), + 'name' => ___('Name', 'advanced_search_form_name'), + 'averagerating' => ___('Rating', 'advanced_search_form_rating'), + 'weeklydownloads' => ___('Popularity', 'advanced_search_form_popularity') ); if (!isset($sort)) { $sort = ""; @@ -221,7 +221,7 @@ if (!isset($category)) $category = array(0, 0); <input type="hidden" id="vfuz" name="vfuz" value="false" /> <div class="container application"> - <label for="appid"><?=___('Application'); ?></label> + <label for="appid"><?=___('Application', 'advanced_search_form_application'); ?></label> <?php $html->simpleSelectTag('appid', $applications, $appid, array(), array(), false)?> </div> @@ -239,7 +239,7 @@ if (!isset($category)) $category = array(0, 0); <fieldset class="subsidiary"> <div class="container"> - <label for="atype"><?=___('Type'); ?></label> + <label for="atype"><?=___('Type', 'advanced_search_form_type'); ?></label> <?php $html->simpleSelectTag('atype', $addon_types, $atype, array(), array(), false); ?> </div> <div class="container"> @@ -247,7 +247,7 @@ if (!isset($category)) $category = array(0, 0); <?php $html->simpleSelectTag('pp', $pages, $pp, array(), array(), false); ?> </div> <div class="container"> - <label for="pid"><?=___('Platform'); ?></label> + <label for="pid"><?=___('Platform', 'advanced_search_form_platform'); ?></label> <?php $html->simpleSelectTag('pid', $platforms, $pid, array(), array(), false); ?> </div> <div class="container"> @@ -261,7 +261,7 @@ if (!isset($category)) $category = array(0, 0); </fieldset> </div> - <div id="advanced-link" title="<?=___('Toggle advanced search mode');?>"><a href="<?=$toggle_uri; ?>"><?= ___('Advanced') ?></a></div> + <div id="advanced-link" title="<?=___('Toggle advanced search mode');?>"><a href="<?=$toggle_uri; ?>"><?= ___('Advanced', 'advanced_search_form') ?></a></div> </form> <div id="search-bubble-inner"></div> @@ -279,7 +279,7 @@ if (!isset($category)) $category = array(0, 0); echo "\"{$version}\": \"{$version}\", "; } } - echo "'".___('Any')."' : 'any' };\n"; + echo "'".___('Any', 'advanced_search_form_any_type')."' : 'any' };\n"; } // to get default version value set up correctly needed to do after $appid, $lver and $hver set-up above in this element diff --git a/site/app/views/elements/amo2009/users/vcard.thtml b/site/app/views/elements/amo2009/users/vcard.thtml index 4774bcc..6e729b0 100644 --- a/site/app/views/elements/amo2009/users/vcard.thtml +++ b/site/app/views/elements/amo2009/users/vcard.thtml @@ -60,30 +60,30 @@ if (!isset($table_class)) { <table class="<?=$table_class?>" summary="<?=___('Developer Information')?>"> <tbody> <tr> - <th><?=___('Name')?></th> + <th><?=___('Name', 'addon_developer_th_name')?></th> <td class="fn n"><?=$user['display_name']?></td> </tr> <? if (!empty($user['location'])): ?> <tr> - <th><?=___('Location')?></th> + <th><?=___('Location', 'addon_developer_th_location')?></th> <td class="adr"><?=$user['location']?></td> </tr> <? endif; ?> <? if (!empty($user['occupation'])): ?> <tr> - <th><?=___('Occupation')?></th> + <th><?=___('Occupation', 'addon_developer_th_occupation')?></th> <td class="role"><?=$user['occupation']?></td> </tr> <? endif; ?> <? if (!empty($user['homepage'])): ?> <tr> - <th><?=___('Homepage')?></th> + <th><?=___('Homepage', 'addon_developer_th_homepage')?></th> <td><a class="url" href="<?=$user['homepage']?>"><?=$user['homepage']?></a></td> </tr> <? endif; ?> <?php if (!$user['emailhidden']): ?> <tr> - <th><?=___('Email address')?></th> + <th><?=___('Email address', 'addon_developer_th_email')?></th> <td><a class="email" href="mailto:<?=$user['email']?>"><?=$user['email']?></a></td> </tr> <?php endif; ?> diff --git a/site/app/views/elements/categories.thtml b/site/app/views/elements/categories.thtml index 4c41280..de51f22 100644 --- a/site/app/views/elements/categories.thtml +++ b/site/app/views/elements/categories.thtml @@ -47,7 +47,7 @@ global $hybrid_categories; ?> <div id="categories"> - <h3 title="<?=___('Choose a category')?>"><span><?=___('Categories')?></span></h3> + <h3 title="<?=___('Choose a category')?>"><span><?=___('Categories', 'categories_header')?></span></h3> <?php if (isset($highlight) && !empty($highlight)) { diff --git a/site/app/views/elements/developers/actionbar.thtml b/site/app/views/elements/developers/actionbar.thtml index 7b87b54..2ab5403 100644 --- a/site/app/views/elements/developers/actionbar.thtml +++ b/site/app/views/elements/developers/actionbar.thtml @@ -39,15 +39,15 @@ <div class="action-bar actionbar <?=(!empty($disabled) && $disabled == 1 ? 'inactive' : 'active')?>"> <ul> <?php if (!empty($revamp) && $revamp === true): ?> - <li class="edit"><a href="<?=$html->url('/developers/addon/edit/'.$addon_id)?>" class="view"><?=___('Edit Add-on')?></a></li> + <li class="edit"><a href="<?=$html->url('/developers/addon/edit/'.$addon_id)?>" class="view"><?=___('Edit Add-on', 'devcp_actionbar_link_edit')?></a></li> <li class="status"><a href="<?=$html->url('/developers/addon/status/'.$addon_id)?>" class="view">Change Status</a></li> - <li class="statistics"><a href="<?=$html->url('/statistics/addon/'.$addon_id)?>" class="view"><?=___('Statistics Dashboard')?></a></li> + <li class="statistics"><a href="<?=$html->url('/statistics/addon/'.$addon_id)?>" class="view"><?=___('Statistics Dashboard', 'devcp_actionbar_link_stats')?></a></li> <li class="versions"><a href="<?=$html->url('/developers/versions/'.$addon_id)?>" class="view">Versions and Files</a></li> <?php else: ?> <li class="details active-only"><a href="<?=$html->url('/developers/details/'.$addon_id)?>" class="view"><?=___('Detailed Info')?></a></li> <li class="displaypage active-only"><a href="<?=$html->url('/addon/'.$addon_id)?>" class="view">View Listing</a></li> - <li class="statistics"><a href="<?=$html->url('/statistics/addon/'.$addon_id)?>" class="view"><?=___('Statistics Dashboard')?></a></li> - <li class="edit"><a href="<?=$html->url('/developers/edit/'.$addon_id)?>" class="view"><?=___('Edit Add-on')?></a></li> + <li class="statistics"><a href="<?=$html->url('/statistics/addon/'.$addon_id)?>" class="view"><?=___('Statistics Dashboard', 'devcp_actionbar_link_stats')?></a></li> + <li class="edit"><a href="<?=$html->url('/developers/edit/'.$addon_id)?>" class="view"><?=___('Edit Add-on', 'devcp_actionbar_link_edit')?></a></li> <li class="versions-add active-only"><a href="<?=$html->url('/developers/add/'.$addon_id)?>" class="view"><?=___('Upload New Version')?></a></li> <?php endif; ?> </ul> diff --git a/site/app/views/elements/developers/additem.thtml b/site/app/views/elements/developers/additem.thtml index c376d7e..4193192 100644 --- a/site/app/views/elements/developers/additem.thtml +++ b/site/app/views/elements/developers/additem.thtml @@ -38,7 +38,7 @@ ?> <div id="sidebar"> <div id="categories"> - <h3><span><?=___('Submit Add-on')?></span></h3> + <h3><span><?=___('Submit Add-on', 'devcp_additem_sidebar_title')?></span></h3> <ul id="cat-list"> <?php @@ -73,7 +73,7 @@ <?php if ($step > 0 && $step < 5) { echo '<div id="submissionHelp">'; - echo $html->link(___('Submission Help'), '/pages/submissionhelp#step'.$step, array('target' => '_blank', 'title' => ___('Opens in a new window'))); + echo $html->link(___('Submission Help', 'devcp_additem_submissionhelp_link'), '/pages/submissionhelp#step'.$step, array('target' => '_blank', 'title' => ___('Opens in a new window'))); echo '</div>'; } ?> diff --git a/site/app/views/elements/developers/editbox.thtml b/site/app/views/elements/developers/editbox.thtml index dc6f4ff..ea578b8 100644 --- a/site/app/views/elements/developers/editbox.thtml +++ b/site/app/views/elements/developers/editbox.thtml @@ -40,12 +40,12 @@ <h4><?=$html->link($addon_name, '/developers/dashboard#addon-'.$addon_id)?></h4> <ul class="actionbar"> <li class="displaypage"><?=$html->link(___('View Listing'), "/addon/{$addon_id}/")?></li> - <li class="edit<?=($action == 'edit' ? ' selected' : '')?>"><?=$html->link(___('Edit Add-on'), "/developers/addon/edit/{$addon_id}/")?></li> + <li class="edit<?=($action == 'edit' ? ' selected' : '')?>"><?=$html->link(___('Edit Add-on', 'devcp_editbox_edit_addon'), "/developers/addon/edit/{$addon_id}/")?></li> <?php if ($action == 'edit'): ?> <li class="container"><ul> <li class="edit-authors<?=($subaction == 'authors' ? ' selected' : '')?>"><?=$html->link(___('Authors'), "/developers/addon/edit/{$addon_id}/authors")?></li> - <li class="edit-categories<?=($subaction == 'categories' ? ' selected' : '')?>"><?=$html->link(___('Categories'), "/developers/addon/edit/{$addon_id}/categories")?></li> - <li class="edit-tags<?=($subaction == 'tags' ? ' selected' : '')?>"><?=$html->link(___('Tags'), "/developers/addon/edit/{$addon_id}/tags")?></li> + <li class="edit-categories<?=($subaction == 'categories' ? ' selected' : '')?>"><?=$html->link(___('Categories', 'devcp_editbox_categories'), "/developers/addon/edit/{$addon_id}/categories")?></li> + <li class="edit-tags<?=($subaction == 'tags' ? ' selected' : '')?>"><?=$html->link(___('Tags', 'devcp_editbox_tags'), "/developers/addon/edit/{$addon_id}/tags")?></li> <li class="edit-descriptions<?=($subaction == 'descriptions' ? ' selected' : '')?>"><?=$html->link(___('Descriptions'), "/developers/addon/edit/{$addon_id}/descriptions")?></li> <li class="edit-properties<?=($subaction == 'properties' ? ' selected' : '')?>"><?=$html->link(___('Properties'), "/developers/addon/edit/{$addon_id}/properties")?></li> @@ -59,9 +59,9 @@ </li> </ul></li> <?php endif; ?> - <li class="status<?=($action == 'status' ? ' selected' : '')?>"><?=$html->link(___('Change Status'), "/developers/addon/status/{$addon_id}/")?></li> - <li class="statistics"><?=$html->link(___('Statistics Dashboard'), "/statistics/addon/{$addon_id}/")?></li> - <li class="versions<?=($action == 'versions' ? ' selected' : '')?>"><?=$html->link(___('Versions and Files'), "/developers/versions/{$addon_id}/")?></li> + <li class="status<?=($action == 'status' ? ' selected' : '')?>"><?=$html->link(___('Change Status', 'devcp_editbox_change_status'), "/developers/addon/status/{$addon_id}/")?></li> + <li class="statistics"><?=$html->link(___('Statistics Dashboard', 'devcp_editbox_statistics_dashboard'), "/statistics/addon/{$addon_id}/")?></li> + <li class="versions<?=($action == 'versions' ? ' selected' : '')?>"><?=$html->link(___('Versions and Files', 'devcp_editbox_versions'), "/developers/versions/{$addon_id}/")?></li> <?php if ($action == 'versions'): ?> <li class="container"><ul> <li class="versions-add<?=($subaction == 'add' ? ' selected' : '')?>"><?=$html->link(___('New Version'), "/developers/versions/add/{$addon_id}")?></li> diff --git a/site/app/views/elements/developers/editors_comment_add_form.thtml b/site/app/views/elements/developers/editors_comment_add_form.thtml index 8fc25ed..fec2f14 100644 --- a/site/app/views/elements/developers/editors_comment_add_form.thtml +++ b/site/app/views/elements/developers/editors_comment_add_form.thtml @@ -46,7 +46,7 @@ if ($is_subscribed) { $submit_value = ___('Unsubscribe'); $action = '/editors/threadunsubscribe/'; } else { - $submit_value = ___('Subscribe'); + $submit_value = ___('Subscribe', 'editors_review_submit_subscribe'); $action = '/editors/threadsubscribe/'; } ?> diff --git a/site/app/views/elements/developers/editors_review_history_item.thtml b/site/app/views/elements/developers/editors_review_history_item.thtml index 7e98635..3eece81 100644 --- a/site/app/views/elements/developers/editors_review_history_item.thtml +++ b/site/app/views/elements/developers/editors_review_history_item.thtml @@ -71,7 +71,7 @@ else echo ___('Nomination Denied/Sandbox'); } elseif ($hist['Approval']['action'] == STATUS_NOMINATED) { - echo ___('Admin Review'); + echo ___('Admin Review', 'editors_review_history_nominated_adminreview'); } } elseif ($hist['Approval']['reviewtype'] == 'pending') { @@ -82,14 +82,14 @@ else echo ___('Denied/Sandbox'); } elseif ($hist['Approval']['action'] == STATUS_PENDING) { - echo ___('Admin Review'); + echo ___('Admin Review', 'editors_review_history_nominated_adminreview'); } } elseif ($hist['Approval']['reviewtype'] == 'info') { if (empty($hist['Approval']['reply_to'])) echo ___('Information Request'); else - echo ___('Reply'); + echo ___('Reply', 'editors_review_history_info_reply'); } ?> </td> diff --git a/site/app/views/elements/developers/editorsmenu.thtml b/site/app/views/elements/developers/editorsmenu.thtml index e9254a0..e208141 100644 --- a/site/app/views/elements/developers/editorsmenu.thtml +++ b/site/app/views/elements/developers/editorsmenu.thtml @@ -49,18 +49,18 @@ if (empty($mode)) { <div id="sidebar"> <div id="categories"> - <h3><span><?=___('Editor Tools')?></span></h3> + <h3><span><?=___('Editor Tools', 'editorcp_menu_title')?></span></h3> <ul id="cat-list"> - <li<?=($page == 'summary') ? ' class="selected"' : ''?>><?=$html->link(___('Editor Summary'), '/editors/summary')?></li> + <li<?=($page == 'summary') ? ' class="selected"' : ''?>><?=$html->link(___('Editor Summary', 'editorcp_menu_summary_link'), '/editors/summary')?></li> <li<?=($mode == 'reviews') ? ' class="selected"' : ''?>><?=$html->link(sprintf(n___('Moderated Reviews (%s)', 'Moderated Reviews (%s)', $count['reviews']), $count['reviews']), '/editors/queue/reviews')?></li> <li<?=($mode == 'pending') ? ' class="selected"' : ''?>><?=$html->link(sprintf(n___('Pending Updates (%s)', 'Pending Updates (%s)', $count['pending']), $count['pending']), '/editors/queue/pending')?></li> <li<?=($mode == 'nominated') ? ' class="selected"' : ''?>><?=$html->link(sprintf(n___('Nominated Add-ons (%s)', 'Nominated Add-ons (%s)', $count['nominated']), $count['nominated']), '/editors/queue/nominated')?></li> - <li<?=($mode == 'featured') ? ' class="selected"' : ''?>><?=$html->link(___('Featured Add-ons'), '/editors/featured')?></li> - <li<?=($page == 'logs') ? ' class="selected"' : ''?>><?=$html->link(___('Event Log'), '/editors/logs')?></li> - <li<?=($page == 'reviewlog') ? ' class="selected"' : ''?>><?=$html->link(___('Review Log'), '/editors/reviewlog')?></li> + <li<?=($mode == 'featured') ? ' class="selected"' : ''?>><?=$html->link(___('Featured Add-ons', 'devcp_editorsqueue_featured'), '/editors/featured')?></li> + <li<?=($page == 'logs') ? ' class="selected"' : ''?>><?=$html->link(___('Event Log', 'editorcp_menu_eventlog_link'), '/editors/logs')?></li> + <li<?=($page == 'reviewlog') ? ' class="selected"' : ''?>><?=$html->link(___('Review Log', 'editorcp_menu_reviewlog_link'), '/editors/reviewlog')?></li> <li<?=($page == 'performance') ? ' class="selected"' : ''?>><?=$html->link(___('Performance'), '/editors/performance')?></li> - <li><?=$html->link(___('Back to Main'), '/')?></li> + <li><?=$html->link(___('Back to Main', 'editorcp_menu_mainpage_link'), '/')?></li> </ul> </div> </div> diff --git a/site/app/views/elements/developers/myaddons.thtml b/site/app/views/elements/developers/myaddons.thtml index 8d5adc1..f614a80 100644 --- a/site/app/views/elements/developers/myaddons.thtml +++ b/site/app/views/elements/developers/myaddons.thtml @@ -47,7 +47,7 @@ <div id="categories" class="secondary-item-list"> <?php if (!$this->controller->Session->check('User')): ?> - <h4><?=$html->link(___('Log in'), $html->login_url())?></h4> + <h4><?=$html->link(___('Log in', 'header_navlink_login'), $html->login_url())?></h4> <?php else: ?> <h4><?=$html->link(___('My Add-ons'), '/developers/index')?></h4> <ul id="cat-list"> @@ -64,17 +64,17 @@ </div> <div class="secondary-item-list"> - <h4><span><?=___('Developer Tools')?></span></h4> + <h4><span><?=___('Developer Tools', 'devcp_myaddons_title')?></span></h4> <ul class=""> - <li><?=$html->link(___('Submit Add-on'), '/developers/addon/submit')?></li> - <li><?=$html->link(___('Statistics Dashboard'), '/statistics')?></li> + <li><?=$html->link(___('Submit Add-on', 'devcp_myaddons_submitaddon_link'), '/developers/addon/submit')?></li> + <li><?=$html->link(___('Statistics Dashboard', 'devcp_myaddons_statistics_link'), '/statistics')?></li> <?php if ($this->controller->SimpleAcl->actionAllowed('Editors', '*', $this->controller->Session->read('User'))): ?> - <li><?=$html->link(___('Editor Tools'), '/editors')?></li> + <li><?=$html->link(___('Editor Tools', 'devcp_myaddons_editorcp_link'), '/editors')?></li> <?php endif; if ($this->controller->SimpleAcl->actionAllowed('Admin', '%', $this->controller->Session->read('User'))): ?> - <li><?=$html->link(___('Admin Tools'), '/admin')?></li> + <li><?=$html->link(___('Admin Tools', 'devcp_myaddons_admincp_link'), '/admin')?></li> <?php endif; ?> - <li><?=$html->link(___('Back to Main'), '/')?></li> + <li><?=$html->link(___('Back to Main', 'devcp_myaddons_mainpage_link'), '/')?></li> </ul> <?php endif; ?> diff --git a/site/app/views/elements/developers/sidebar.thtml b/site/app/views/elements/developers/sidebar.thtml index 16e9eeb..803c307 100644 --- a/site/app/views/elements/developers/sidebar.thtml +++ b/site/app/views/elements/developers/sidebar.thtml @@ -45,7 +45,7 @@ ?> <div id="categories"> - <h3><span><?=___('Developer Tools')?></span></h3> + <h3><span><?=___('Developer Tools', 'devcp_myaddons_title')?></span></h3> <ul id="cat-list"> <?php if ($this->controller->Session->check('User')): ?> @@ -59,17 +59,17 @@ } } ?> - <li><?=$html->link(___('Submit Add-on'), '/developers/addon/submit')?></li> - <li><?=$html->link(___('Statistics Dashboard'), '/statistics')?></li> + <li><?=$html->link(___('Submit Add-on', 'devcp_myaddons_submitaddon_link'), '/developers/addon/submit')?></li> + <li><?=$html->link(___('Statistics Dashboard', 'devcp_myaddons_statistics_link'), '/statistics')?></li> <?php if ($this->controller->SimpleAcl->actionAllowed('Editors', '*', $this->controller->Session->read('User'))): ?> - <li><?=$html->link(___('Editor Tools'), '/editors')?></li> + <li><?=$html->link(___('Editor Tools', 'devcp_myaddons_editorcp_link'), '/editors')?></li> <?php endif; if ($this->controller->SimpleAcl->actionAllowed('Admin', '%', $this->controller->Session->read('User'))): ?> - <li><?=$html->link(___('Admin Tools'), '/admin')?></li> + <li><?=$html->link(___('Admin Tools', 'devcp_myaddons_admincp_link'), '/admin')?></li> <?php endif; ?> - <li><?=$html->link(___('Back to Main'), '/')?></li> + <li><?=$html->link(___('Back to Main', 'devcp_myaddons_mainpage_link'), '/')?></li> <?php else: ?> - <li><?=$html->link(___('Log in'), $html->login_url())?></li> + <li><?=$html->link(___('Log in', 'header_navlink_login'), $html->login_url())?></li> <?php endif; ?> </ul> diff --git a/site/app/views/elements/developers/testresults.thtml b/site/app/views/elements/developers/testresults.thtml index becb738..fd066ed 100644 --- a/site/app/views/elements/developers/testresults.thtml +++ b/site/app/views/elements/developers/testresults.thtml @@ -58,7 +58,7 @@ <?= $this->renderElement('developers/testresults_group', array('group' => $group, 'file' => $file)); ?> <? endforeach; ?> <? else : ?> - <i><?=___('No test results found.')?></i> + <i><?=___('No test results found.', 'devcp_versions_validate_no_results')?></i> <? endif; ?> </div> </div> diff --git a/site/app/views/elements/developers/testresults_group.thtml b/site/app/views/elements/developers/testresults_group.thtml index d41bd01..59dd8b8 100644 --- a/site/app/views/elements/developers/testresults_group.thtml +++ b/site/app/views/elements/developers/testresults_group.thtml @@ -55,7 +55,7 @@ if ($group['counts'][TEST_WARN] == 0 && $group['counts'][TEST_FAIL] == 0) { <? if (!empty($group['cases'])) : ?> <div class="results-list <?=$group_class?>"> <? foreach ($group['cases'] as $case) : ?> - <h5><?=$case['name']?> [<?=$html->link(___('help'), '/pages/validation#help-'.$case['id'])?>]</h5> + <h5><?=$case['name']?> [<?=$html->link(___('help', 'devcp_validation_help'), '/pages/validation#help-'.$case['id'])?>]</h5> <ul class="test-results"> <? $resultNum = 0; ?> <? if (!empty($case['results'])) : ?> @@ -112,6 +112,6 @@ if ($group['counts'][TEST_WARN] == 0 && $group['counts'][TEST_FAIL] == 0) { <i><?= ___('All tests passed.') ?> <a href="#" onclick="versions_validate.showPasses($(this)); return false;"><?= n___('Show pass', 'Show passes', count($group['cases'])) ?></a></i> <? endif; ?> <? else: ?> - <i><?= ___('No test results found.') ?></i> + <i><?= ___('No test results found.', 'devcp_versions_validate_no_results') ?></i> <? endif; ?> </div> diff --git a/site/app/views/elements/developers/testresults_header.thtml b/site/app/views/elements/developers/testresults_header.thtml index 2aaa04d..6db7c32 100644 --- a/site/app/views/elements/developers/testresults_header.thtml +++ b/site/app/views/elements/developers/testresults_header.thtml @@ -59,6 +59,6 @@ </li> <? endforeach; ?> <? else : ?> - <i><?=___('No test results found.')?></i> + <i><?=___('No test results found.', 'devcp_versions_validate_no_results')?></i> <? endif; ?> </ul> diff --git a/site/app/views/elements/developers/testresults_stats.thtml b/site/app/views/elements/developers/testresults_stats.thtml index 261bc76..33218ff 100644 --- a/site/app/views/elements/developers/testresults_stats.thtml +++ b/site/app/views/elements/developers/testresults_stats.thtml @@ -71,7 +71,7 @@ </span> <? endif; ?> <? if ($counts == array(0,0,0)) : ?> - <span><i><?=___('No test results found.')?></i></span> + <span><i><?=___('No test results found.', 'devcp_error_no_test_results')?></i></span> <? endif; ?> <? if ($short) : ?> <span class="loading-count"><?=___('Running test...')?></span> diff --git a/site/app/views/elements/footer.thtml b/site/app/views/elements/footer.thtml index 8586d05..12339ad 100644 --- a/site/app/views/elements/footer.thtml +++ b/site/app/views/elements/footer.thtml @@ -58,7 +58,7 @@ } ?> </select> - <input class="hidden" type="submit" value="<?=___('Go')?>"/> + <input class="hidden" type="submit" value="<?=___('Go', 'footer_lang_form_lang_submit_go')?>"/> </p> </form> <?php endif; ?> @@ -66,11 +66,11 @@ <div id="footer-legal"> <p id="copyright"><?=___('Copyright')?> <span title="<?=php_uname('n')?>">©</span> 2005–<?=date('Y')?> Mozilla. <?=___('All rights reserved.')?></p> <ul id="nav-legal"> - <li><?=$html->link(___('Privacy Policy'), '/pages/privacy');?></li> + <li><?=$html->link(___('Privacy Policy', 'footer_privacy_policy'), '/pages/privacy');?></li> <li><a href="http://www.mozilla.com/<?=LANG?>/about/legal.html"><?=___('Legal Notices')?></a></li> - <?php if (!isset($suppressCredits) || !$suppressCredits): ?><li><?=$html->link(___('Credits'), '/pages/credits')?></li><?php endif; ?> - <li><?=$html->link(___('About'), '/pages/about')?></li> - <li><?=$html->link('<abbr title="'.___('Frequently Asked Questions').'">'.___('FAQ').'</abbr>', '/pages/faq')?></li> + <?php if (!isset($suppressCredits) || !$suppressCredits): ?><li><?=$html->link(___('Credits', 'footer_credits'), '/pages/credits')?></li><?php endif; ?> + <li><?=$html->link(___('About', 'footer_a_about'), '/pages/about')?></li> + <li><?=$html->link('<abbr title="'.___('Frequently Asked Questions', 'footer_abbr_faq').'">'.___('FAQ').'</abbr>', '/pages/faq')?></li> <li><a href="http://blog.mozilla.com/addons"><?=___('Blog')?></a></li> </ul> <p id="footer-disclaimer"><?=___('Mozilla is providing links to these applications as a courtesy, and makes no representations regarding the applications or any information related there to. Any questions, complaints or claims regarding the applications must be directed to the appropriate software vendor.')?></p> diff --git a/site/app/views/elements/header.thtml b/site/app/views/elements/header.thtml index c48a819..306cde5 100644 --- a/site/app/views/elements/header.thtml +++ b/site/app/views/elements/header.thtml @@ -55,11 +55,11 @@ else $url_format = "/status:%s"; if (isset($addonStatus) && $addonStatus == STATUS_SANDBOX) { - $homeText = ___('Sandbox'); + $homeText = ___('Sandbox', 'a_header_sandbox'); $homeLink = "/addons/home/status:" . STATUS_SANDBOX; } else { - $homeText = ___('Add-ons'); + $homeText = ___('Add-ons', 'header_main_header'); $homeLink = "/"; } @@ -72,14 +72,14 @@ } } $sandboxUrl = $publicUrl . sprintf($url_format, STATUS_SANDBOX); - $sandboxUrl = $html->link(___('Sandbox'), $sandboxUrl); - $publicUrl = $html->link(___('Public'), $publicUrl); + $sandboxUrl = $html->link(___('Sandbox', 'a_header_sandbox'), $sandboxUrl); + $publicUrl = $html->link(___('Public', 'a_header_public'), $publicUrl); if(isset($sandboxAccess) && $sandboxAccess && $this->controller->action != 'display') { if ($addonStatus == STATUS_SANDBOX) - $sandboxLink = "$publicUrl | ".___('Sandbox'); + $sandboxLink = "$publicUrl | ".___('Sandbox', 'a_header_sandbox'); else - $sandboxLink = ___('Public')." | $sandboxUrl"; + $sandboxLink = ___('Public', 'a_header_public')." | $sandboxUrl"; } switch (APP_SHORTNAME) { @@ -96,7 +96,7 @@ $main_header = ___('Thunderbird Add-ons'); break; default: - $main_header = ___('Add-ons'); + $main_header = ___('Add-ons', 'header_main_header'); break; } ?> @@ -143,20 +143,20 @@ if ($this->controller->Session->check('User')) { $user = $this->controller->Session->read('User'); echo '<li>' . $html->link(___('My Account'), '/users/edit', array('title' => $user['email'])) . '</li>' . "\n"; - echo '<li>' . $html->link(___('Developer Tools'), '/developers') . '</li>' . "\n"; + echo '<li>' . $html->link(___('Developer Tools', 'sidebar_navlink_developer_tools'), '/developers') . '</li>' . "\n"; if ($this->controller->SimpleAcl->actionAllowed('Editors', '%', $this->controller->Session->read('User'))) { - echo '<li>' . $html->link(___('Editor Tools'), '/editors') .'</li>' . "\n"; + echo '<li>' . $html->link(___('Editor Tools', 'sidebar_navlink_editor_tools'), '/editors') .'</li>' . "\n"; } if ($this->controller->SimpleAcl->actionAllowed('Localizers', '%', $this->controller->Session->read('User'))) { echo '<li>' . $html->link('Localizer Tools', '/localizers') . '</li>' . "\n"; } if ($this->controller->SimpleAcl->actionAllowed('Admin', '%', $this->controller->Session->read('User'))) { - echo '<li>' . $html->link(___('Admin Tools'), '/admin') . '</li>' . "\n"; + echo '<li>' . $html->link(___('Admin Tools', 'sidebar_navlink_admin_tools'), '/admin') . '</li>' . "\n"; } echo '<li>' . $html->link(___('Log out'), $html->logout_url()) . '</li>' . "\n"; } else { - echo '<li>' . $html->link(___('Register'), '/users/register') . '</li> ' . "\n"; - echo '<li>' . $html->link(___('Log in'), $html->login_url()) . '</li>' . "\n"; + echo '<li>' . $html->link(___('Register', 'header_navlink_register'), '/users/register') . '</li> ' . "\n"; + echo '<li>' . $html->link(___('Log in', 'header_navlink_login'), $html->login_url()) . '</li>' . "\n"; } ?> </ul> diff --git a/site/app/views/elements/pitch.thtml b/site/app/views/elements/pitch.thtml index 4dbcac5..463dcd9 100644 --- a/site/app/views/elements/pitch.thtml +++ b/site/app/views/elements/pitch.thtml @@ -45,14 +45,14 @@ global $browser_apps; if (in_array(APP_ID, $browser_apps)) { $pitch_links = array( - '/browse/type:'.ADDON_THEME.'/cat:all?sort=name' => ___('Theme'), + '/browse/type:'.ADDON_THEME.'/cat:all?sort=name' => ___('Theme', 'sidebar_pitch_theme'), '/browse/type:'.ADDON_SEARCH.'/cat:all?sort=name' => ___('Search Plugin'), - '/browse/type:'.ADDON_DICT => ___('Dictionary') + '/browse/type:'.ADDON_DICT => ___('Dictionary', 'sidebar_pitch_dictionary') ); } else { $pitch_links = array( - '/browse/type:'.ADDON_THEME.'/cat:all?sort=name' => ___('Theme'), - '/browse/type:'.ADDON_DICT => ___('Dictionary') + '/browse/type:'.ADDON_THEME.'/cat:all?sort=name' => ___('Theme', 'sidebar_pitch_theme'), + '/browse/type:'.ADDON_DICT => ___('Dictionary', 'sidebar_pitch_dictionary') ); } @@ -67,9 +67,9 @@ if (in_array(APP_ID, $browser_apps)) { <?php // RSS links the hard way, bug 426541 $subscribeHeader = ___('Subscribe to'); - $newestLink = ___('Newest Add-ons'); - $updatedLink = ___('Updated Add-ons'); - $featuredLink = ___('Featured Add-ons'); + $newestLink = ___('Newest Add-ons', 'sidebar_pitch_newest_addons'); + $updatedLink = ___('Updated Add-ons', 'sidebar_pitch_updated_addons'); + $featuredLink = ___('Featured Add-ons', 'sidebar_pitch_featured_addons'); ?> <br/> <h3><?=$subscribeHeader?></h3> diff --git a/site/app/views/elements/search.thtml b/site/app/views/elements/search.thtml index 03d7500..08dd74d 100644 --- a/site/app/views/elements/search.thtml +++ b/site/app/views/elements/search.thtml @@ -93,7 +93,7 @@ if(!isset($hver)) { // AmoPlatforms is from controller->beforeRender() array_shift($AmoPlatforms); // get rid of PLATFORM_ALL -$platforms = array_merge(array(PLATFORM_ANY => ___('Any')), $AmoPlatforms); //add semantically happy PLATFORM_ANY +$platforms = array_merge(array(PLATFORM_ANY => ___('Any', 'advanced_search_form_any_type')), $AmoPlatforms); //add semantically happy PLATFORM_ANY $pid = 0; if (isset($this->params['url']['pid']) && in_array($this->params['url']['pid'], array_keys($platforms))) { @@ -106,7 +106,7 @@ if (isset($this->params['url']['pid']) // goes to a static page and the latter is empty array_pop($AmoAddonTypes); array_pop($AmoAddonTypes); -$addon_types = array_merge(array(ADDON_ANY => ___('Any')), $AmoAddonTypes); +$addon_types = array_merge(array(ADDON_ANY => ___('Any', 'advanced_search_form_any_type')), $AmoAddonTypes); if (!isset($atype)) { $atype = ADDON_ANY; } @@ -140,10 +140,10 @@ if (isset($this->params['url']['lup']) $sort_orders = array( '' => ___('Keyword Match'), - 'newest' => ___('Newest'), - 'name' => ___('Name'), - 'averagerating' => ___('Rating'), - 'weeklydownloads' => ___('Popularity') + 'newest' => ___('Newest', 'advanced_search_form_newest'), + 'name' => ___('Name', 'advanced_search_form_name'), + 'averagerating' => ___('Rating', 'advanced_search_form_rating'), + 'weeklydownloads' => ___('Popularity', 'advanced_search_form_popularity') ); if (!isset($sort)) { $sort = ""; @@ -209,7 +209,7 @@ if (!isset($category)) $category = array(0, 0); <input type="hidden" id="vfuz" name="vfuz" value="false" /> <table> <tr> - <td><?=___('Application'); ?>:</td> + <td><?=___('Application', 'advanced_search_form_application'); ?>:</td> <td><?php $html->simpleSelectTag('appid', $applications, $appid, array(), array(), false)?></td> <td><?=___('version'); ?></td><td id="lver-td"> <input name="lver" type="text" size="5" maxlength="10" value="<?=$lver ?>" /></td> @@ -220,8 +220,8 @@ if (!isset($category)) $category = array(0, 0); </fieldset> <fieldset id="search-platform"> <table> - <tr><td><?=___('Type'); ?>:</td><td><?php $html->simpleSelectTag('atype', $addon_types, $atype, array(), array(), false); ?></td></tr> - <tr><td><?=___('Platform'); ?>:</td><td><?php $html->simpleSelectTag('pid', $platforms, $pid, array(), array(), false); ?></td></tr> + <tr><td><?=___('Type', 'advanced_search_form_type'); ?>:</td><td><?php $html->simpleSelectTag('atype', $addon_types, $atype, array(), array(), false); ?></td></tr> + <tr><td><?=___('Platform', 'advanced_search_form_platform'); ?>:</td><td><?php $html->simpleSelectTag('pid', $platforms, $pid, array(), array(), false); ?></td></tr> <tr><td><?=___('Last Updated'); ?>:</td><td><?php $html->simpleSelectTag('lup', $updates, $lup, array(), array(), false); ?></td></tr> </table> </fieldset> @@ -236,7 +236,7 @@ if (!isset($category)) $category = array(0, 0); </div> <div id="advanced-search-toggle" title="<?=___('Toggle advanced search mode');?>"> <div></div> - <span id="toggle-outer"><span id="toggle-inner"><!--[if IE]> <![endif]--></span><a id="advanced-search-toggle-link" href="<?=$toggle_uri; ?>" class="asclosed"><?php echo ___('Advanced'); ?></a></span> + <span id="toggle-outer"><span id="toggle-inner"><!--[if IE]> <![endif]--></span><a id="advanced-search-toggle-link" href="<?=$toggle_uri; ?>" class="asclosed"><?php echo ___('Advanced', 'advanced_search_form'); ?></a></span> </div> </div> <script type="text/javascript"> @@ -251,7 +251,7 @@ if (!isset($category)) $category = array(0, 0); echo "\"{$version}\": \"{$version}\", "; } } - echo "'".___('Any')."' : 'any' };\n"; + echo "'".___('Any', 'advanced_search_form_any_type')."' : 'any' };\n"; } // to get default version value set up correctly needed to do after $appid, $lver and $hver set-up above in this element diff --git a/site/app/views/elements/translationbox.thtml b/site/app/views/elements/translationbox.thtml index bb143fe..d656213 100644 --- a/site/app/views/elements/translationbox.thtml +++ b/site/app/views/elements/translationbox.thtml @@ -65,7 +65,7 @@ if (!isset($graybox) || $graybox === true) { } else { echo '<div class="translation-box'.(isset($extraclass)?' '.$extraclass:'').'">'; } - echo (!empty($displayName) ? '<h4><a href="#" title="'.___('Help (does not leave page)').'" onclick="translation_box.showHelp(this); return false;">'.$html->image('developers/help.png', array('alt' => ___('Help'))).'</a>'.$displayName.' </h4>' : ''); + echo (!empty($displayName) ? '<h4><a href="#" title="'.___('Help (does not leave page)').'" onclick="translation_box.showHelp(this); return false;">'.$html->image('developers/help.png', array('alt' => ___('Help', 'devcp_transbox_alt_help'))).'</a>'.$displayName.' </h4>' : ''); echo (!empty($description) ? "<p>{$description}</p>" : ''); ?> <div class="translation-row"> @@ -121,7 +121,7 @@ if (!isset($graybox) || $graybox === true) { <div class="buttons"> <input type="button" value="<?=___('Add Locale')?>" onclick="translation_box.addLocale(this, false);" /> <input type="button" value="<?=___('Add Locale to All')?>" onclick="translation_box.addLocale(this, true);" /> - <input type="button" value="<?=___('Cancel')?>" onclick="translation_box.cancelAdd(this);" /> + <input type="button" value="<?=___('Cancel', 'devcp_transbox_input_cancel')?>" onclick="translation_box.cancelAdd(this);" /> </div> </div> </div> @@ -132,7 +132,7 @@ if (!isset($graybox) || $graybox === true) { <?=___('Are you sure you wish to delete this translation?')?> <div class="buttons"> <input type="button" value="<?=___('Delete It')?>" onclick="translation_box.removeLocale(this);" /> - <input type="button" value="<?=___('Cancel')?>" onclick="translation_box.cancelRemove(this);" /> + <input type="button" value="<?=___('Cancel', 'devcp_transbox_input_cancel')?>" onclick="translation_box.cancelRemove(this);" /> </div> </div> </div> diff --git a/site/app/views/layouts/amo2009.thtml b/site/app/views/layouts/amo2009.thtml index 0b90406..d2dfbfa 100644 --- a/site/app/views/layouts/amo2009.thtml +++ b/site/app/views/layouts/amo2009.thtml @@ -283,13 +283,13 @@ if(defined('SITE_STATE') && (SITE_STATE == 'production' || SITE_STATE == 'stagin else: $tools_links = array(); $user = $this->controller->Session->read('User'); - $tools_links[] = $html->link(___('Developer Tools'), '/developers'); + $tools_links[] = $html->link(___('Developer Tools', 'sidebar_navlink_developer_tools'), '/developers'); if ($this->controller->SimpleAcl->actionAllowed('Editors', '%', $this->controller->Session->read('User'))) - $tools_links[] = $html->link(___('Editor Tools'), '/editors'); + $tools_links[] = $html->link(___('Editor Tools', 'sidebar_navlink_editor_tools'), '/editors'); if ($this->controller->SimpleAcl->actionAllowed('Localizers', '%', $this->controller->Session->read('User'))) $tools_links[] = $html->link('Localizer Tools', '/localizers'); if ($this->controller->SimpleAcl->actionAllowed('Admin', '%', $this->controller->Session->read('User'))) - $tools_links[] = $html->link(___('Admin Tools'), '/admin'); + $tools_links[] = $html->link(___('Admin Tools', 'sidebar_navlink_admin_tools'), '/admin'); if (count($tools_links) > 1): ?> @@ -340,18 +340,18 @@ if(defined('SITE_STATE') && (SITE_STATE == 'production' || SITE_STATE == 'stagin } ?> </select> - <button type="submit"><?=___('Go')?></button> + <button type="submit"><?=___('Go', 'footer_lang_form_lang_submit_go')?></button> </div> </form> <?php endif; ?> <p><strong><?=___('Copyright')?> <span title="<?=php_uname('n')?>">©</span> 2005–<?=date('Y')?> Mozilla.</strong> <?=___('All rights reserved.')?></p> <ul> - <li><?=$html->link(___('Privacy Policy'), '/pages/privacy');?></li> + <li><?=$html->link(___('Privacy Policy', 'footer_privacy_policy'), '/pages/privacy');?></li> <li><a href="http://www.mozilla.com/<?=LANG?>/about/legal.html"><?=___('Legal Notices')?></a></li> - <?php if (!isset($suppressCredits) || !$suppressCredits): ?><li><?=$html->link(___('Credits'), '/pages/credits')?></li><?php endif; ?> - <li><?=$html->link(___('About'), '/pages/about')?></li> - <li><?=$html->link('<abbr title="'.___('Frequently Asked Questions').'">'.___('FAQ').'</abbr>', '/pages/faq')?></li> + <?php if (!isset($suppressCredits) || !$suppressCredits): ?><li><?=$html->link(___('Credits', 'footer_credits'), '/pages/credits')?></li><?php endif; ?> + <li><?=$html->link(___('About', 'footer_a_about'), '/pages/about')?></li> + <li><?=$html->link('<abbr title="'.___('Frequently Asked Questions', 'footer_abbr_faq').'">'.___('FAQ').'</abbr>', '/pages/faq')?></li> <li><a href="http://blog.mozilla.com/addons"><?=___('Blog')?></a></li> </ul> diff --git a/site/app/views/pages/collector.thtml b/site/app/views/pages/collector.thtml index a011cca..1de285f 100644 --- a/site/app/views/pages/collector.thtml +++ b/site/app/views/pages/collector.thtml @@ -44,7 +44,7 @@ $_install_button = $this->renderElement('amo2009/install', $params); $_breadcrumbs = array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' ); ?> diff --git a/site/app/views/pages/collector_faq.thtml b/site/app/views/pages/collector_faq.thtml index 46de6ee..596b3fa 100644 --- a/site/app/views/pages/collector_faq.thtml +++ b/site/app/views/pages/collector_faq.thtml @@ -47,7 +47,7 @@ $this->layout = 'amo2009'; <?php $breadcrumbs = array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' ); ?> <?=$this->renderElement('amo2009/breadcrumbs', array('breadcrumbs' => $breadcrumbs))?> diff --git a/site/app/views/pages/collector_features.thtml b/site/app/views/pages/collector_features.thtml index be8fd12..ffb996c 100644 --- a/site/app/views/pages/collector_features.thtml +++ b/site/app/views/pages/collector_features.thtml @@ -52,7 +52,7 @@ $this->layout = 'amo2009'; <?php $breadcrumbs = array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' ); ?> <?=$this->renderElement('amo2009/breadcrumbs', array('breadcrumbs' => $breadcrumbs))?> @@ -69,7 +69,7 @@ $this->layout = 'amo2009'; </li> <li> <a href="<?=$html->url('/pages/collector_faq')?>"> - <?=___('Frequently Asked Questions')?> + <?=___('Frequently Asked Questions', 'footer_abbr_faq')?> </a> </li> </ul> diff --git a/site/app/views/pages/collector_firstrun.thtml b/site/app/views/pages/collector_firstrun.thtml index dc83e6b..44f64ef 100644 --- a/site/app/views/pages/collector_firstrun.thtml +++ b/site/app/views/pages/collector_firstrun.thtml @@ -40,7 +40,7 @@ $this->layout = 'amo2009'; $breadcrumbs = array( sprintf(___('Add-ons for %1$s'), APP_PRETTYNAME) => '/', - ___('Collections') => '/collections' + ___('Collections', 'collections_breadcrumb') => '/collections' ); // This code is a bit ugly because we need to work within the constraints of the pages controller. // Build the collection menu here because we have access to the controllers we need. diff --git a/site/app/views/pages/js_constants.js.thtml b/site/app/views/pages/js_constants.js.thtml index ed42109..146bbba 100644 --- a/site/app/views/pages/js_constants.js.thtml +++ b/site/app/views/pages/js_constants.js.thtml @@ -76,26 +76,26 @@ $constants = array( /* developers.js */ 'devcp_js_upload_alert' => ___('You must select a file to upload.'), - 'addons_status_public' => ___('Public'), + 'addons_status_public' => ___('Public', 'addons_status_public'), 'addons_status_sandbox' => ___('In Sandbox'), 'addons_status_pending' => ___('In Sandbox; Pending Review'), 'devcp_js_img_move_down' => ___('Move Down'), 'devcp_js_img_move_up' => ___('Move Up'), 'devcp_js_option_owner' => ___('Owner'), - 'devcp_js_option_developer' => ___('Developer'), + 'devcp_js_option_developer' => ___('Developer', 'devcp_js_option_developer'), 'devcp_js_option_viewer' => ___('Viewer'), 'devcp_js_input_list_author' => ___('List as author in public listings'), 'devcp_js_sure_remove' => ___('Are you <strong>sure</strong> you wish to remove this author?'), 'devcp_js_remove_author' => ___('Remove Author'), - 'devcp_js_a_cancel' => ___('Cancel'), + 'devcp_js_a_cancel' => ___('Cancel', 'devcp_js_a_cancel'), 'devcp_js_add_email' => ___('Please enter the account email of the author you wish to add.'), - 'devcp_js_img_remove_compat' => ___('Remove Application Compatibility'), + 'devcp_js_img_remove_compat' => ___('Remove Application Compatibility', 'devcp_js_img_remove_compat'), 'devcp_js_license_select' => ___('Please select a license.'), 'devcp_js_license_text' => ___('Please enter text for your license.'), // collections 'collections_edit_submit' => ___('Update Collection'), - 'collections_edit_submit_deletecollection' => ___('Delete Collection'), + 'collections_edit_submit_deletecollection' => ___('Delete Collection', 'collections_edit_submit_deletecollection'), /* addons display page */ 'addons_display_collection_publish_success' => ___('%1$s has been added to the %2$s collection.') diff --git a/site/app/views/previews/add.thtml b/site/app/views/previews/add.thtml index 46cfaf9..5e5c93a 100644 --- a/site/app/views/previews/add.thtml +++ b/site/app/views/previews/add.thtml @@ -40,7 +40,7 @@ <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?> <div id="content-main"> - <h3><?=___('Add Preview')?></h3> + <h3><?=___('Add Preview', 'devcp_previews_header_add')?></h3> <div class="addonName"><?=$addon['Translation']['name']['string']?></div> <p><?=___('Use the form below to upload a PNG, JPG, or GIF screenshot of your add-on. Images larger than 700 pixels wide and 525 pixels high will automatically be resized.')?></p> <?php diff --git a/site/app/views/previews/edit.thtml b/site/app/views/previews/edit.thtml index 1adbbcc..d008b5f 100644 --- a/site/app/views/previews/edit.thtml +++ b/site/app/views/previews/edit.thtml @@ -40,7 +40,7 @@ <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?> <div id="content-main"> - <h3><?=___('Edit Preview')?></h3> + <h3><?=___('Edit Preview', 'devcp_previews_header_edit')?></h3> <div class="addonName"><?=$addon['Translation']['name']['string']?></div> <?=$html->formTag('/previews/edit/'.$id, 'post')?> <div id="developersForm"> @@ -51,8 +51,8 @@ </div> <?=$this->renderElement('developers/localebox')?> <div class="buttonBox"> - <?=$html->submit(___('Edit Preview'))?> - <?=$html->submit(___('Delete Preview'), array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\''.___('Are you sure you wish to delete this preview?').'\');'))?> + <?=$html->submit(___('Edit Preview', 'devcp_previews_header_edit'))?> + <?=$html->submit(___('Delete Preview', 'devcp_previews_submit_delete'), array('name' => 'delete', 'class' => 'cancel', 'onClick' => 'return confirm(\''.___('Are you sure you wish to delete this preview?').'\');'))?> </div> </div> <!-- developersForm --> </form> diff --git a/site/app/views/reviews/display.thtml b/site/app/views/reviews/display.thtml index c3cc8d5..812d92a 100644 --- a/site/app/views/reviews/display.thtml +++ b/site/app/views/reviews/display.thtml @@ -52,7 +52,7 @@ $bare = isset($_GET['bare']) ? ( $_GET['bare'] == 1 ) : FALSE; <div id="content-main" class="primary" role="main"> <?=$this->renderElement('amo2009/search')?> -<h2><?=sprintf(___('Reviews for %s'), $addon['Translation']['name']['string']);?></h2> +<h2><?=sprintf(___('Reviews for %s', 'reviews_header'), $addon['Translation']['name']['string']);?></h2> <?php else: ?> <div class="other-reviews"> <?php endif ?> @@ -73,7 +73,7 @@ foreach ($reviews as $review): $html->linkUserFromModel($review['User']), strftime(___('%B %e, %Y'), strtotime($review['Review']['created']))); ?> - <?=($isAuthor || $isAdmin) ? '['.$html->link(___('Reply'), "/reviews/reply/{$review['Review']['id']}").']' : '' ?> + <?=($isAuthor || $isAdmin) ? '['.$html->link(___('Reply', 'addon_review_author_reply_link'), "/reviews/reply/{$review['Review']['id']}").']' : '' ?> <?=($canDelete) ? '['.$html->link(___('Delete'), "/reviews/delete/{$review['Review']['id']}").']' : ''?> <?php /* Show either the review moderation form, or display a diff --git a/site/app/views/reviews/flag.thtml b/site/app/views/reviews/flag.thtml index 174a1d9..0e70136 100644 --- a/site/app/views/reviews/flag.thtml +++ b/site/app/views/reviews/flag.thtml @@ -53,7 +53,7 @@ else: <?=$this->renderElement('notification', array('msg' => $msg));?> <p><?=$html->link(___('Click here to return to the front page.'), '/')?></p> <?php else: ?> - <h2><?=sprintf(___('Reviews for %s'), $addon['Translation']['name']['string']);?></h2> + <h2><?=sprintf(___('Reviews for %s', 'reviews_header'), $addon['Translation']['name']['string']);?></h2> <?=$this->renderElement('notification', array('msg' => $msg));?> <ul> diff --git a/site/app/views/reviews/review_added.thtml b/site/app/views/reviews/review_added.thtml index 92b12da..39c9aef 100644 --- a/site/app/views/reviews/review_added.thtml +++ b/site/app/views/reviews/review_added.thtml @@ -47,7 +47,7 @@ $this->layout = 'amo2009'; <div class="primary" role="main"> <?=$this->renderElement('amo2009/search')?> - <h2><?=sprintf(___('Reviews for %s'), $addon['Translation']['name']['string']);?></h2> + <h2><?=sprintf(___('Reviews for %s', 'reviews_header'), $addon['Translation']['name']['string']);?></h2> <?=$this->renderElement('notification', array('type' => 'success', 'msg' => ___('Your review was saved successfully. Thanks!')));?> <? if (isset($moderated) && $moderated) $this->renderElement('notification', array('type' => 'notification', 'msg' => ___('Please note: Before your review shows up on the public site it will be moderated by an editor.'))); ?> diff --git a/site/app/views/search/collections.thtml b/site/app/views/search/collections.thtml index 2b142b6..4d078b9 100644 --- a/site/app/views/search/collections.thtml +++ b/site/app/views/search/collections.thtml @@ -48,7 +48,7 @@ $this->layout = 'amo2009'; </div> <div class="primary" role="main"> <?=$this->renderElement('amo2009/breadcrumbs')?> - <h2><?=___('Collection Search Results')?></h2> + <h2><?=___('Collection Search Results', 'search_collections_header')?></h2> <div class="featured listing"> <div class="featured-inner"> <div class="listing-header"> diff --git a/site/app/views/search/index.thtml b/site/app/views/search/index.thtml index 76d6a7b..a3033e4 100644 --- a/site/app/views/search/index.thtml +++ b/site/app/views/search/index.thtml @@ -113,10 +113,10 @@ $params = array( <?php $sort_orders = array( '' => ___('Keyword Match'), - 'newest' => ___('Newest'), - 'name' => ___('Name'), - 'averagerating' => ___('Rating'), - 'weeklydownloads' => ___('Popularity') + 'newest' => ___('Newest', 'advanced_search_form_newest'), + 'name' => ___('Name', 'advanced_search_form_name'), + 'averagerating' => ___('Rating', 'advanced_search_form_rating'), + 'weeklydownloads' => ___('Popularity', 'advanced_search_form_popularity') ); $html->simpleSelectTag('sort', $sort_orders, $sort, array(), array(), false); ?> @@ -126,7 +126,7 @@ $params = array( <input type="hidden" name="<?=$name?>" value="<?=$val?>" /> <?php endif; ?> <?php endforeach; ?> - <button><?=___('Go')?></button> + <button><?=___('Go', 'collections_index_button_go')?></button> </form> <script type="text/javascript">collections.hijack_favorite_button();</script> <?php endif; ?> @@ -189,7 +189,7 @@ $params = array( </ul> </div> <div id="refine-category"> - <h5><?=___('Categories')?></h5> + <h5><?=___('Categories', 'search_filter_categories_header')?></h5> <ul class="refinements"> <?php if ($category == array(0,0)) { @@ -197,7 +197,7 @@ $params = array( } else { $selected = ""; } - echo '<li'.$selected.'><a href="'.$html->url("/search?q=".$search_terms."&appid=".$appid."&cat=all&tag=".$tag."&atype=".$atype."&pid=".$pid."&lup=".$lup."&sort=".$sort."&hver=".$hver."&lver=".$lver."&vfuz=".$vfuz."&pp=".$pp).'">'.___('All').'</a></li>'; + echo '<li'.$selected.'><a href="'.$html->url("/search?q=".$search_terms."&appid=".$appid."&cat=all&tag=".$tag."&atype=".$atype."&pid=".$pid."&lup=".$lup."&sort=".$sort."&hver=".$hver."&lver=".$lver."&vfuz=".$vfuz."&pp=".$pp).'">'.___('All', 'search_refine_all_categories_link').'</a></li>'; $results_categories = array(); foreach ($search_results as $addon) { if (!empty($addon['Category'])) { @@ -217,7 +217,7 @@ $params = array( </ul> </div> <div id="refine-tags"> - <h5><?=___('Tags')?></h5> + <h5><?=___('Tags', 'search_filter_tags_header')?></h5> <ul class="refinements addon-tags"> <?php if (empty($top_tags)) { diff --git a/site/app/views/sharing_api/addon.thtml b/site/app/views/sharing_api/addon.thtml index 9aa31fd..14d81e8 100644 --- a/site/app/views/sharing_api/addon.thtml +++ b/site/app/views/sharing_api/addon.thtml @@ -60,9 +60,9 @@ if (empty($addonIconPath)) { <version><?php echo $addon['install_version']; ?></version> <status id='<?php echo $addon['status']; ?>'><?php if ($addon['status'] == STATUS_PUBLIC) { - echo rtrim(___('Public')); + echo rtrim(___('Public', 'a_header_public')); } else { - echo rtrim(___('Sandbox')); + echo rtrim(___('Sandbox', 'a_header_sandbox')); } ?></status> <authors> diff --git a/site/app/views/statistics/addon.thtml b/site/app/views/statistics/addon.thtml index 4b9d921..f25c3af 100644 --- a/site/app/views/statistics/addon.thtml +++ b/site/app/views/statistics/addon.thtml @@ -55,9 +55,9 @@ echo '<div id="content">'; } ?> <span id="statistics-links"> - <?=$html->link(___('Developer Tools'), '/developers')?> | + <?=$html->link(___('Developer Tools', 'statistics_addon_developertools_link'), '/developers')?> | <?=$html->link(___('Dashboard Home'), '/statistics')?> | - <a href="#" onclick="$('#helpbox').toggle(); return false;"><?=___('Help')?></a> + <a href="#" onclick="$('#helpbox').toggle(); return false;"><?=___('Help', 'statistics_help_link')?></a> </span> </div> <div> @@ -72,7 +72,7 @@ echo '<div id="content">'; <div id="helpbox" style="display: none;"> <?=$localization->includeLocalPage('statistics_help')?> - <a href="#" onclick="$('#helpbox').hide(); return false;"><?=___('Close')?></a> + <a href="#" onclick="$('#helpbox').hide(); return false;"><?=___('Close', 'statistics_help_close_link')?></a> </div> <?php if ($stats['totaldownloads'] > 0): ?> @@ -100,7 +100,7 @@ echo '<div id="content">'; </div> <div class="plot-legend"> <div class="colorbox" style="background-color: #EE3322;"></div> - <div class="plot-name"><?=___('Active Daily Users')?></div> + <div class="plot-name"><?=___('Active Daily Users', 'statistics_plot_legend_adu')?></div> </div> </div> </div> @@ -158,7 +158,7 @@ echo '<div id="content">'; <td class="bigvalue" style="width: 19%;"><?=$statistics->number_format($stats, 'totaldownloads')?></td> <td class="spacer" style="width: 2%;"></td> <td class="biglabel" valign="middle" style="width: 30%;"> - <?=___('Active Daily Users')?> + <?=___('Active Daily Users', 'statistics_plot_legend_adu')?> <div class="date"> <?php if (!empty($stats['last_updatepings_date'])) diff --git a/site/app/views/statistics/index.thtml b/site/app/views/statistics/index.thtml index 1b1bffe..00e05e7 100644 --- a/site/app/views/statistics/index.thtml +++ b/site/app/views/statistics/index.thtml @@ -36,14 +36,14 @@ * * ***** END LICENSE BLOCK ***** */ ?> -<h1><?=___('Statistics Dashboard')?></h1> +<h1><?=___('Statistics Dashboard', 'statistics_index_title')?></h1> <div class="secondary" role="complementary"> <div class="highlight"> <h2><?=___('Site Statistics')?></h2> <dl> <dt><?=$html->number_format($statsOverview['totalDownloads'])?></dt> - <dd><?=___('Add-ons Downloaded')?></dd> + <dd><?=___('Add-ons Downloaded', 'statistics_addons_downloaded')?></dd> <dt><?=$html->number_format($statsOverview['totalInUse'])?></dt> <dd><?=___('Add-ons in Use')?></dd> @@ -87,8 +87,8 @@ <table id="stats-table-instance"> <thead> <tr class="header"> - <th class="first"><?=___('Date')?></th> - <th><?=___('Add-ons Downloaded')?></th> + <th class="first"><?=___('Date', 'list_sortby_date')?></th> + <th><?=___('Add-ons Downloaded', 'statistics_addons_downloaded')?></th> <th><?=___('Add-ons In Use')?></th> <th><?=___('Add-ons Created')?></th> <th><?=___('Add-ons Updated')?></th> diff --git a/site/app/views/statistics/rss/summary.thtml b/site/app/views/statistics/rss/summary.thtml index f023620..8132f92 100644 --- a/site/app/views/statistics/rss/summary.thtml +++ b/site/app/views/statistics/rss/summary.thtml @@ -36,14 +36,14 @@ * * ***** END LICENSE BLOCK ***** */ -$summary = '<b>'.___('Downloads').'</b><br />'; +$summary = '<b>'.___('Downloads', 'statistics_summary_downloads_heading').'</b><br />'; $summary .= ___('Total Downloads').' ('.sprintf(___('Since %1$s'), strftime(___('%b. %e, %Y'), strtotime($addon['Addon']['created']))).'): '.$statistics->number_format($stats, 'totaldownloads').'<br />'; $summary .= ___('Last Day Count').(!empty($stats['last_downloads_date']) ? ' ('.strftime(___('%A, %b. %e'), strtotime($stats['last_downloads_date'])).')' : '').': '.$statistics->number_format($stats, 'last_downloads').'<br />'; $summary .= ___('Average Daily Downloads').': '.$statistics->number_format($stats, 'avg_downloads').'<br />'; $summary .= ___('Downloads in the last 7 days').': '.$statistics->number_format($stats, 'weeklydownloads').'<br /><br />'; -$summary .= '<b>'.___('Active Daily Users').'</b><br />'; -$summary .= ___('Active Daily Users').' ('; +$summary .= '<b>'.___('Active Daily Users', 'statistics_summary_updatepings_heading').'</b><br />'; +$summary .= ___('Active Daily Users', 'statistics_summary_updatepings_heading').' ('; if (!empty($stats['last_updatepings_date'])) $summary .= sprintf(___('On %1$s'), strftime(___('%A, %b. %e'), strtotime($stats['last_updatepings_date']))); else diff --git a/site/app/views/statistics/settings.thtml b/site/app/views/statistics/settings.thtml index 8670542..2127255 100644 --- a/site/app/views/statistics/settings.thtml +++ b/site/app/views/statistics/settings.thtml @@ -49,7 +49,7 @@ <p><?=___('By default, only you and Mozilla can access the information in your dashboard. You can open this up to the public so that anyone can view your add-on\'s data.')?></p> <ul class="options"> <li><label><input type="radio" name="data[Addon][publicstats]" value="0"<?=($addon['Addon']['publicstats'] != 1 ? ' checked' : '')?>> <?='<b>'.___('Private').'</b> - '.___('Only you and Mozilla can view this add-on\'s statistics')?></label></li> - <li><label><input type="radio" name="data[Addon][publicstats]" value="1"<?=($addon['Addon']['publicstats'] == 1 ? ' checked' : '')?>> <?='<b>'.___('Public').'</b> - '.___('Anyone can view this add-on\'s statistics')?></label></li> + <li><label><input type="radio" name="data[Addon][publicstats]" value="1"<?=($addon['Addon']['publicstats'] == 1 ? ' checked' : '')?>> <?='<b>'.___('Public', 'statistics_settings_access_public').'</b> - '.___('Anyone can view this add-on\'s statistics')?></label></li> </ul> <div class="buttons"> diff --git a/site/app/views/tags/display.thtml b/site/app/views/tags/display.thtml index 0cbb42c..c8189e9 100644 --- a/site/app/views/tags/display.thtml +++ b/site/app/views/tags/display.thtml @@ -73,14 +73,14 @@ <label><?=___('Sort By'); ?></label> <?php $sort_orders = array( - 'newest' => ___('Newest'), - 'name' => ___('Name'), - 'averagerating' => ___('Rating'), - 'weeklydownloads' => ___('Popularity') + 'newest' => ___('Newest', 'advanced_search_form_newest'), + 'name' => ___('Name', 'advanced_search_form_name'), + 'averagerating' => ___('Rating', 'advanced_search_form_rating'), + 'weeklydownloads' => ___('Popularity', 'advanced_search_form_popularity') ); $html->simpleSelectTag('sort', $sort_orders, $sort, array(), array(), false); ?> - <button><?=___('Go')?></button> + <button><?=___('Go', 'addons_author_addons_submit')?></button> </form> <script type="text/javascript">collections.hijack_favorite_button();</script> </div> diff --git a/site/app/views/users/edit.thtml b/site/app/views/users/edit.thtml index 42cf7bb..9a9dbea 100644 --- a/site/app/views/users/edit.thtml +++ b/site/app/views/users/edit.thtml @@ -84,7 +84,7 @@ $this->translationBox = array( <div id="tabbed-editor" class="flora"> <ul class="tabs-nav"> <li><a href="#profile-user"><span><?=___('User Profile');?></span></a></li> - <li><a href="#profile-collections"><span><?=___('Collections');?></span></a></li> + <li><a href="#profile-collections"><span><?=___('Collections', 'user_tab_collections');?></span></a></li> <li><a href="#profile-notifications"><span><?=___('Notifications');?></span></a></li> <li><a href="#profile-change-pw-email"><span><?=___('Change Password or Email'); ?></span></a></li> <li><a href="#profile-other"><span><?=___('Other Actions');?></span></a></li> @@ -109,11 +109,11 @@ $this->translationBox = array( <?=$html->tagErrorMsg('User/nickname', ___('This nickname is already taken.'))?> </div> <div class="line"> - <label class="amo-label-large" for="UserLocation"><?=___('Location')?></label> + <label class="amo-label-large" for="UserLocation"><?=___('Location', 'user_form_location')?></label> <?=$html->input('User/location') ?> </div> <div class="line"> - <label class="amo-label-large" for="UserOccupation"><?=___('Occupation')?></label> + <label class="amo-label-large" for="UserOccupation"><?=___('Occupation', 'user_form_occupation')?></label> <?=$html->input('User/occupation') ?> </div> <div class="line"> @@ -154,7 +154,7 @@ $this->translationBox = array( </div> <div id="profile-collections"> - <h3 class="hidden"><?=___('Collections');?></h3> + <h3 class="hidden"><?=___('Collections', 'user_tab_collections');?></h3> <div class="line"> <?=$html->checkbox('User/display_collections') ?> <label for="UserDisplayCollections"><?=___('Display the collections I have created in my user profile')?></label> @@ -189,8 +189,8 @@ $this->translationBox = array( <thead> <tr> <th><?php /* jquery will add a check/uncheck all box here */ ?></th> - <th><?=___('Add-on')?></th> - <th><?=___('Subject')?></th> + <th><?=___('Add-on', 'user_notifications_th_addon')?></th> + <th><?=___('Subject', 'user_notifications_th_subject')?></th> <th><?=___('Subscription Date')?></th> </tr> </thead> @@ -227,7 +227,7 @@ $this->translationBox = array( </div> <h3><?=___('Change Email Address');?></h3> <div class="line"> - <label class="amo-label-large" for="UserEmail"><?=___('Email address')?></label> + <label class="amo-label-large" for="UserEmail"><?=___('Email address', 'user_form_email')?></label> <?=$html->input('User/email') ?> <?php if (isset($error_email_notunique)) echo '<div class="error_message">'.___('This email address is already taken by another user.').'</div>'; diff --git a/site/app/views/users/login.thtml b/site/app/views/users/login.thtml index 14646d0..017f9ee 100644 --- a/site/app/views/users/login.thtml +++ b/site/app/views/users/login.thtml @@ -81,7 +81,7 @@ ?> </div> <div class="container"> - <label for="LoginEmail"><?=___('Email address')?></label> + <label for="LoginEmail"><?=___('Email address', 'user_form_email')?></label> <?=$html->input('Login/email') ?> </div> <div class="container"> @@ -93,7 +93,7 @@ <label for="LoginRemember"><?=___('Remember me on this computer')?></label> </div> <div class="container"> - <button type="submit" class="prominent"><?= ___('Log in') ?></button> + <button type="submit" class="prominent"><?= ___('Log in', 'user_form_submit_login') ?></button> </div> </form> </div> diff --git a/site/app/views/users/pwreset.thtml b/site/app/views/users/pwreset.thtml index 8e97d84..1fa5130 100644 --- a/site/app/views/users/pwreset.thtml +++ b/site/app/views/users/pwreset.thtml @@ -49,7 +49,7 @@ <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box"> <?=$html->hiddenSession() ?> <div class="container"> - <label class="amo-label-large" for="UserEmail"><?=___('Email address')?></label> + <label class="amo-label-large" for="UserEmail"><?=___('Email address', 'user_form_email')?></label> <?=$html->input('User/email') ?> <?=$html->tagErrorMsg('User/email', ___('User not found!'))?> </div> diff --git a/site/app/views/users/register.thtml b/site/app/views/users/register.thtml index 418199f..4dc4139 100644 --- a/site/app/views/users/register.thtml +++ b/site/app/views/users/register.thtml @@ -60,7 +60,7 @@ endif; <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form"> <?=$html->hiddenSession() ?> <div class="container"> - <label class="amo-label-large" for="UserEmail"><?=___('Email address')?></label> + <label class="amo-label-large" for="UserEmail"><?=___('Email address', 'user_form_email')?></label> <?=$html->input('User/email') ?> <?=(isset($error_email_notunique)) ? '<div class="error_message">'.___('This email address is already taken by another user.').'</div>' : $html->tagErrorMsg('User/email', ___('This is not a valid email address.'))?> </div> @@ -103,14 +103,14 @@ endif; <div class="container"> <div class="amo-label-large"> <label for="recaptcha_response_field"><?=___('Are you human?')?></label><br/> - <span id="recaptcha_whatsthis"><a href="javascript:Recaptcha.showhelp()"><?=___('What\'s this?')?></a></span> + <span id="recaptcha_whatsthis"><a href="javascript:Recaptcha.showhelp()"><?=___('What\'s this?', 'recaptcha_whatsthis')?></a></span> </div> <div class="amo-form-indent"><?=$this->renderElement('recaptcha')?></div> <?=$html->tagErrorMsg('User/captcha', ___('Invalid captcha, please try again!'))?> </div> <?php endif; ?> <div class="container"> - <?=$html->submit(___('Register'), array('class'=>'amo-submit')); ?> + <?=$html->submit(___('Register', 'user_form_submit_register'), array('class'=>'amo-submit')); ?> </div> </form> |