Merge lp:~canonical-isd-hackers/canonical-identity-provider/device-types-translations into lp:canonical-identity-provider/release

[Michael Foord]

Add translation tags to device type page.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'identityprovider/templates/device/types.html'
--- identityprovider/templates/device/types.html	2012-06-26 13:31:27 +0000
+++ identityprovider/templates/device/types.html	2012-06-26 16:05:36 +0000
@@ -24,33 +24,33 @@
   <dl>
 
     <dt style="font-weight: bold"><label>
-      <input type="radio" name="type" value="google" id="type_google" checked="checked"> Android, Apple or Blackberry mobile device
+      <input type="radio" name="type" value="google" id="type_google" checked="checked"> {% trans "Android, Apple or Blackberry mobile device" %}
     </label></dt>
     <dd style="margin-left: 2em">
-      <p><label for="type_google">Smartphone or tablet with the Google Authenticator app (or
-          Auth7 on Windows phone)</label></p>
+      <p><label for="type_google">{% blocktrans %}Smartphone or tablet with the Google Authenticator app (or
+          Auth7 on Windows phone){% endblocktrans %}</label></p>
     </dd>
 
     <dt style="font-weight: bold"><label>
-      <input type="radio" name="type" value="yubi" id="type_yubi"> YubiKey
+      <input type="radio" name="type" value="yubi" id="type_yubi"> {% trans "YubiKey" %}
       </label></dt>
     <dd style="margin-left: 2em">
-      <p><label for="type_yubi">USB YubiKey one time password generator</label></p>
+      <p><label for="type_yubi">{% blocktrans %}USB YubiKey one time password generator{% endblocktrans %}</label></p>
     </dd>
 
     <dt style="font-weight: bold"><label>
-      <input type="radio" name="type" value="generic" id="type_generic"> Generic HOTP device
+      <input type="radio" name="type" value="generic" id="type_generic"> {% trans "Generic HOTP device" %}
     </label></dt>
     <dd style="margin-left: 2em">
-      <p><label for="type_generic">Any other OATH/HOTP compatible device</label></p>
+      <p><label for="type_generic">{% blocktrans %}Any other OATH/HOTP compatible device{% endblocktrans %}</label></p>
     </dd>
 
     <!-- <dt style="font-weight: bold"><label>
-      <input type="radio" name="type" value="paper" id="type_paper" disabled="disabled"> One-time pad
+      <input type="radio" name="type" value="paper" id="type_paper" disabled="disabled"> {% trans "One-time pad" %}
     </label></dt>
     <dd style="margin-left: 2em">
-      <p><label for="type_paper">A paper with a list of one-time
-      passwords.</label></p>
+      <p><label for="type_paper">{% blocktrans %}A paper with a list of one-time
+      passwords.{% endblocktrans %}</label></p>
     </dd> -->
 
   </dl>