diff --git a/docs/PRIMARY_PROTOCOL.md b/docs/PRIMARY_PROTOCOL.md
index 713e4d96750b2645bba805e1da719ab8d0c0a20c..6e58aa41b0c9fc211c33d531acafa2e883aa0a7b 100644
--- a/docs/PRIMARY_PROTOCOL.md
+++ b/docs/PRIMARY_PROTOCOL.md
@@ -160,7 +160,7 @@ properties available to normal web content.
### 4.2 JavaScript Shim
To support browsers without native BrowserID support, the provisioning
-content should include the a javascript shim, hosted at:
+content should include a javascript shim, hosted at:
https://browserid.org/provisioning_api.js
diff --git a/lib/browserid/prove_template.ejs b/lib/browserid/prove_template.ejs
index 5cba2343a75abbed57c5aacceaa9c787dfde7465..d9bd314860831e56c4bb86b28586153cb20320d8 100644
--- a/lib/browserid/prove_template.ejs
+++ b/lib/browserid/prove_template.ejs
@@ -1,5 +1,5 @@
-<%= gettext(
- format('Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.', [site])) %>
+<%= format(
+ gettext('Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.'), [site]) %>
<%= gettext('Finish registration by clicking this link:') %> <%= link %>
diff --git a/resources/static/dialog/views/add_email.ejs b/resources/static/dialog/views/add_email.ejs
index 5edfa50aee6b7973d8046133269b631fd40c991e..6ce2207ea78f0e4546e2430e12f8bd38acd7d36c 100644
--- a/resources/static/dialog/views/add_email.ejs
+++ b/resources/static/dialog/views/add_email.ejs
@@ -20,7 +20,7 @@
</div>
<div id="could_not_add" class="tooltip" for="newEmail">
- <%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
+ <%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
</div>
<div id="already_own_address" class="tooltip" for="newEmail">
diff --git a/resources/static/dialog/views/authenticate.ejs b/resources/static/dialog/views/authenticate.ejs
index 0954003dd8cc7cdfef5fa4649d8b5117b842a623..7e08dedb9834d0eb6ae564abd7870b173404efe7 100644
--- a/resources/static/dialog/views/authenticate.ejs
+++ b/resources/static/dialog/views/authenticate.ejs
@@ -18,7 +18,7 @@
</div>
<div id="could_not_add" class="tooltip" for="email">
- <%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
+ <%= gettext('We just sent an email to that address! If you really want to send another, wait a minute or two and try again.') %>
</div>
<div id="already_registered" class="tooltip" for="email">
diff --git a/resources/static/dialog/views/verify_primary_user.ejs b/resources/static/dialog/views/verify_primary_user.ejs
index bd0e4e3925cf2e2298f322972ab4fadea9d9a05b..ed5a10517a1d47e48b0380ac52d2526a78dd3c31 100644
--- a/resources/static/dialog/views/verify_primary_user.ejs
+++ b/resources/static/dialog/views/verify_primary_user.ejs
@@ -16,7 +16,7 @@
</li>
<li>
- <%= gettext("To verify that you own this address, you must sign in with your provider. This window will be redirected to") %>
+ <%= format(gettext("To verify that you own <strong id='primary_email'>%s</strong>, you must sign in with your provider. This window will be redirected to"), [email]) %>
<p>
<strong><%= auth_url %></strong>.
diff --git a/resources/static/provisioning_api.js b/resources/static/provisioning_api.js
index 6ed86940b33898fe83bb988a6208e08797497ff3..7b679e784cee65d3b9a0f9b797d0e10bfedcba48 100644
--- a/resources/static/provisioning_api.js
+++ b/resources/static/provisioning_api.js
@@ -1,6 +1,4 @@
/**
- * Uncompressed source can be found at https://browserid.org/include.orig.js
- *
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/scripts/compress.sh b/scripts/compress.sh
index 36fe7f2a950cc9edc540a7d1057473d6936abb73..45b644df8d424bb69f8fb992dac3415836782875 100755
--- a/scripts/compress.sh
+++ b/scripts/compress.sh
@@ -64,6 +64,9 @@ echo $locales
for locale in $locales; do
mkdir -p $BUILD_PATH/$locale
+ mkdir -p $BUILD_PATH/../i18n/$locale
+ # Touch as the trigger locale doesn't really exist
+ touch $BUILD_PATH/../i18n/${locale}/client.json
cat lib/jquery-1.7.1.min.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js lib/ejs.js shared/javascript-extensions.js i18n/${locale}/client.json shared/gettext.js shared/browserid.js lib/hub.js lib/dom-jquery.js lib/module.js lib/jschannel.js $BUILD_PATH/templates.js shared/renderer.js shared/class.js shared/mediator.js shared/tooltip.js shared/validation.js shared/helpers.js shared/screens.js shared/browser-support.js shared/wait-messages.js shared/error-messages.js shared/error-display.js shared/storage.js shared/xhr.js shared/network.js shared/provisioning.js shared/user.js shared/modules/page_module.js shared/modules/xhr_delay.js shared/modules/xhr_disable_form.js shared/modules/code_check.js shared/modules/cookie_check.js dialog/resources/internal_api.js dialog/resources/helpers.js dialog/resources/state_machine.js dialog/controllers/actions.js dialog/controllers/dialog.js dialog/controllers/authenticate.js dialog/controllers/forgot_password.js dialog/controllers/check_registration.js dialog/controllers/pick_email.js dialog/controllers/add_email.js dialog/controllers/required_email.js dialog/controllers/verify_primary_user.js dialog/controllers/provision_primary_user.js dialog/controllers/primary_user_provisioned.js dialog/controllers/email_chosen.js dialog/start.js > $BUILD_PATH/$locale/dialog.uncompressed.js
done
@@ -94,7 +97,7 @@ cd $PRODUCTION_PATH
pwd
# minify the JS
$UGLIFY < $BUILD_PATH/include.uncompressed.js > include.js
-for locale in `../../../scripts/production_locales`; do
+for locale in $locales; do
mkdir -p $locale
$UGLIFY < $BUILD_PATH/$locale/dialog.uncompressed.js > $locale/dialog.js
$UGLIFY < $BUILD_PATH/$locale/browserid.uncompressed.js > $locale/browserid.js