Skip to content

E
edx-platform
Commit 0d975674 by dino-cikatic
Options

Merge pull request #8186 from edx/dcikatic/SOL-839 

SOL-839 label cursor and receipt internationalization
parents 097f3fca 077ea49b
Showing with 62 additions and 60 deletions
lms/static/sass/views/_shoppingcart.scss
...@@ -643,7 +643,7 @@ $light-border: 1px solid $gray-l5; ...@@ -643,7 +643,7 @@ $light-border: 1px solid $gray-l5;
padding: ($baseline/2) 0; padding: ($baseline/2) 0;
width: 50%; width: 50%;
b { .billing-detail-label {
@include margin-right($baseline); @include margin-right($baseline);
@extend %t-copy-sub1; @extend %t-copy-sub1;
display: inline-block; display: inline-block;
...@@ -651,12 +651,14 @@ $light-border: 1px solid $gray-l5; ...@@ -651,12 +651,14 @@ $light-border: 1px solid $gray-l5;
vertical-align: top; vertical-align: top;
} }
label { .billing-detail-value {
@extend %t-copy-sub1; @extend %t-copy-sub1;
display: inline-block; display: inline-block;
margin: 0; margin: 0;
cursor: text;
width: ($baseline*60); width: ($baseline*60);
word-wrap: break-word; word-wrap: break-word;
color: $gray-d3;
font-style: normal; font-style: normal;
} }
} }
......
lms/templates/shoppingcart/receipt.html
...@@ -107,74 +107,74 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -107,74 +107,74 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<div class="row"> <div class="row">
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Company Name')}:</b> <b class="billing-detail-label">${_('Company Name')}:</b>
<label> <span class="billing-detail-value">
% if order.company_name: % if order.company_name:
${order.company_name} ${order.company_name}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Purchase Order Number')}:</b> <b class="billing-detail-label">${_('Purchase Order Number')}:</b>
<label> <span class="billing-detail-value">
% if order.customer_reference_number: % if order.customer_reference_number:
${order.customer_reference_number} ${order.customer_reference_number}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Company Contact Name')}:</b> <b class="billing-detail-label">${_('Company Contact Name')}:</b>
<label> <span class="billing-detail-value">
% if order.company_contact_name: % if order.company_contact_name:
${order.company_contact_name} ${order.company_contact_name}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Company Contact Email')}:</b> <b class="billing-detail-label">${_('Company Contact Email')}:</b>
<label> <span class="billing-detail-value">
% if order.company_contact_email: % if order.company_contact_email:
${order.company_contact_email} ${order.company_contact_email}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Recipient Name')}:</b> <b class="billing-detail-label">${_('Recipient Name')}:</b>
<label> <span class="billing-detail-value">
% if order.recipient_name: % if order.recipient_name:
${order.recipient_name} ${order.recipient_name}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Recipient Email')}:</b> <b class="billing-detail-label">${_('Recipient Email')}:</b>
<label> <span class="billing-detail-value">
% if order.recipient_email: % if order.recipient_email:
${order.recipient_email} ${order.recipient_email}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
</div> </div>
...@@ -182,98 +182,98 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -182,98 +182,98 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<div class="row"> <div class="row">
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Card Type')}:</b> <b class="billing-detail-label">${_('Card Type')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_cardtype: % if order.bill_to_cardtype:
${order.bill_to_cardtype} ${order.bill_to_cardtype}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Credit Card Number')}:</b> <b class="billing-detail-label">${_('Credit Card Number')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_ccnum: % if order.bill_to_ccnum:
${order.bill_to_ccnum} ${order.bill_to_ccnum}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Name')}:</b> <b class="billing-detail-label">${_('Name')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_first or order.bill_to_last: % if order.bill_to_first or order.bill_to_last:
${order.bill_to_first} ${order.bill_to_last} ${order.bill_to_first} ${order.bill_to_last}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Address 1')}:</b> <b class="billing-detail-label">${_('Address 1')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_street1: % if order.bill_to_street1:
${order.bill_to_street1} ${order.bill_to_street1}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Address 2')}:</b> <b class="billing-detail-label">${_('Address 2')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_street2: % if order.bill_to_street2:
${order.bill_to_street2} ${order.bill_to_street2}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('City')}:</b> <b class="billing-detail-label">${_('City')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_city: % if order.bill_to_city:
${order.bill_to_city} ${order.bill_to_city}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('State')}:</b> <b class="billing-detail-label">${_('State')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_state: % if order.bill_to_state:
${order.bill_to_state} ${order.bill_to_state}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
<div class="row-inside"> <div class="row-inside">
<p> <p>
<b>${_('Country')}:</b> <b class="billing-detail-label">${_('Country')}:</b>
<label> <span class="billing-detail-value">
% if order.bill_to_country: % if order.bill_to_country:
${order.bill_to_country.upper()} ${order.bill_to_country}
% else: % else:
N/A ${_('N/A')}
% endif % endif
</label> </span>
</p> </p>
</div> </div>
</div> </div>
......
lms/templates/shoppingcart/shopping_cart.html
...@@ -137,7 +137,7 @@ from django.utils.translation import ungettext ...@@ -137,7 +137,7 @@ from django.utils.translation import ungettext
% endif % endif
<span class="pull-right">${_('TOTAL:')} <span class="pull-right">${_('TOTAL:')}
<b id="total-amount" data-amount="${'{price:0.2f}'.format(price=amount)}"> <b id="total-amount" data-amount="${'{price:0.2f}'.format(price=amount)}">
## Translators: currency_symbol l is a symbol indicating type of currency, ex "$". currency_abbr is ## Translators: currency_symbol is a symbol indicating type of currency, ex "$". currency_abbr is
## an abbreviation for the currency, ex "USD". This string would look like this when all variables are in: ## an abbreviation for the currency, ex "USD". This string would look like this when all variables are in:
## "$500.00 USD" ## "$500.00 USD"
${_("{currency_symbol}{price} {currency_abbr}").format(currency_symbol=currency_symbol, price="{0:0.2f}".format(amount), currency_abbr=currency.upper())} ${_("{currency_symbol}{price} {currency_abbr}").format(currency_symbol=currency_symbol, price="{0:0.2f}".format(amount), currency_abbr=currency.upper())}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment