diff options
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | extensions/BMO/lib/Data.pm | 6 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl | 2 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl (renamed from extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl) | 6 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/global/choose-product.html.tmpl | 3 | ||||
| -rw-r--r-- | extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl | 3 |
6 files changed, 10 insertions, 12 deletions
@@ -59,7 +59,7 @@ RewriteRule ^form[\.:]moz[\.\-:]project[\.\-:]review$ enter_bug.cgi?product=mozi RewriteRule ^form[\.:]docs?$ enter_bug.cgi?product=Developer+Documentation&format=doc [QSA] RewriteRule ^form[\.:]mdn?$ enter_bug.cgi?product=Mozilla+Developer+Network&format=mdn RewriteRule ^form[\.:](swag|gear)$ enter_bug.cgi?product=mozilla.org&format=swag -RewriteRule ^form[\.:](b2g|fxos)[\.\-:](partner|betaprogram) enter_bug.cgi?product=Boot2Gecko&format=fxos-$2 [QSA] +RewriteRule ^form[\.:](b2g|fxos)[\.\-:](partner|betaprogram) enter_bug.cgi?product=Firefox+OS&format=fxos-$2 [QSA] RewriteRule ^form[\.:]ipp$ enter_bug.cgi?product=Internet+Public+Policy&format=ipp RewriteRule ^form[\.:]creative$ enter_bug.cgi?product=Marketing&format=creative RewriteRule ^form[\.:]user[\.\-:]engagement$ enter_bug.cgi?product=Marketing&format=user-engagement diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm index e070cd244..8d53f0c90 100644 --- a/extensions/BMO/lib/Data.pm +++ b/extensions/BMO/lib/Data.pm @@ -55,7 +55,7 @@ use constant GITHUB_PR_CONTENT_TYPE => 'text/x-github-pull-request'; our $cf_visible_in_products; tie(%$cf_visible_in_products, "Tie::IxHash", qw/^cf_blocking_kilimanjaro|cf_blocking_basecamp|cf_blocking_b2g/ => { - "Boot2Gecko" => [], + "Firefox OS" => [], "Core" => [], "Fennec" => [], "Firefox" => [], @@ -114,7 +114,7 @@ tie(%$cf_visible_in_products, "Tie::IxHash", "Add-on SDK" => [], "addons.mozilla.org" => [], "AUS" => [], - "Boot2Gecko" => [], + "Firefox OS" => [], "Core" => [], "Core Graveyard" => [], "Directory" => [], @@ -162,7 +162,7 @@ tie(%$cf_visible_in_products, "Tie::IxHash", qr/^cf_crash_signature$/ => { "Add-on SDK" => [], "addons.mozilla.org" => [], - "Boot2Gecko" => [], + "Firefox OS" => [], "Calendar" => [], "Camino" => [], "Composer" => [], diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl index d08b2fb78..cd3a539e0 100644 --- a/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl @@ -74,7 +74,7 @@ enctype="multipart/form-data" onsubmit="return onSubmit();"> <input type="hidden" name="format" value="fxos-betaprogram"> <input type="hidden" name="created-format" value="fxos-betaprogram"> -<input type="hidden" name="product" value="Boot2Gecko"> +<input type="hidden" name="product" value="Firefox OS"> <input type="hidden" name="component" value="DogfoodTriage"> <input type="hidden" name="rep_platform" value="ARM"> <input type="hidden" name="op_sys" value="Gonk (Firefox OS)"> diff --git a/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl index 46ed25ef8..3e910990d 100644 --- a/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl @@ -65,7 +65,7 @@ [% END %] [% PROCESS global/header.html.tmpl - title = "Boot2Gecko Partner $terms.Bug Submission" + title = "Firefox OS Partner $terms.Bug Submission" style_urls = [ 'skins/standard/enter_bug.css' ] javascript = inline_js javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', @@ -73,14 +73,14 @@ onload = "showCompDesc(document.getElementById('component'));" %] -<h2>Boot2Gecko Partner [% terms.Bug %] Submission</h2> +<h2>Firefox OS Partner [% terms.Bug %] Submission</h2> <p>All fields are mandatory</p> <form method="post" action="post_bug.cgi" id="bug_form" class="enter_bug_form" enctype="multipart/form-data" onsubmit="return onSubmit();"> <input type="hidden" name="format" value="fxos-partner"> -<input type="hidden" name="product" value="Boot2Gecko"> +<input type="hidden" name="product" value="Firefox OS"> <input type="hidden" name="rep_platform" value="ARM"> <input type="hidden" name="op_sys" value="Gonk (Firefox OS)"> <input type="hidden" name="priority" value="--"> diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl index 1ee21a8bd..8368523f3 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -85,9 +85,8 @@ icon="firefox.png" %] [% INCLUDE easyproduct - name="Boot2Gecko" + name="Firefox OS" icon="firefox.png" - caption="Firefox OS" %] [% INCLUDE easyproduct name="Firefox for Android" diff --git a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl index 59f7e8cb8..46ca386b2 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl @@ -11,9 +11,8 @@ icon="firefox.png" %] [% INCLUDE product_block - name="Boot2Gecko" + name="Firefox OS" icon="firefox.png" - caption="Firefox OS" %] [% INCLUDE product_block name="Firefox for Android" |