Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13037 from OmarIthawi/edraak/calculator-2-fixups

Browse Source 
Calculator wording and translation improvements
This commit is contained in:
Adam
2016-07-21 14:42:53 -04:00
committed by GitHub
parent cae03d0349 38e35ddf82
commit 05700243fe
2 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/static/sass/course/modules/_calculator.scss
View File

@@ -98,6 +98,7 @@
}
#calculator_output {
direction: ltr; // Almost all of the real-world calculators are LTR
background: $white;
border: 1px solid $white;
box-shadow: none;
@@ -130,6 +131,7 @@
}
#calculator_input {
direction: ltr; // Almost all of the real-world calculators are LTR
border: none;
box-shadow: none;
@include box-sizing(border-box);

47
lms/templates/calculator/toggle_calculator.html
View File

@@ -57,25 +57,24 @@ from openedx.core.djangolib.markup import HTML, Text
${_("Fractions")}<br />
${_("Decimals")}
</td>
<td>
<td dir="auto">
2520<br />
2/3<br />
3.14, .98
</td>
</tr>
<tr>
## Translators: This refers to mathematical operators such as `plus`, `minus`, `division` and others.
<th scope="row">${_("Operators")}</th>
## Translators: Please do not translate mathematical symbols.
<td>
<td dir="auto">
${_("+ - * / (add, subtract, multiply, divide)")}<br />
## Translators: Please do not translate mathematical symbols.
${_("^ (raise to a power)")}<br />
## Translators: Please do not translate mathematical symbols.
${_("_ (add a subscript)")}<br />
## Translators: Please do not translate mathematical symbols.
${_("|| (parallel resistors)")}
</td>
<td>
<td dir="auto">
x+(2*y)/x-1
x^(n+1)<br />
v_IN+v_OUT<br />
@@ -83,63 +82,59 @@ from openedx.core.djangolib.markup import HTML, Text
</td>
</tr>
<tr>
<th scope="row">${_("Greek letters")}</th>
<td>${_("Name of letter")}</td>
<td>
alpha<br />
lambda
</td>
</tr>
<tr>
## Translators: This refers to symbols that are mathematical constants, such as "i" (square root of -1)
<th scope="row">${_("Constants")}</th>
<td>c, e, g, i, j, k, pi, q, T</td>
<td>
<td dir="auto">c, e, g, i, j, k, pi, q, T</td>
<td dir="auto">
20*c<br />
418*T
</td>
</tr>
<tr>
## Translators: This refers to symbols that appear at the end of a number, such as the percent sign (%) and metric affixes
<th scope="row">${_("Affixes")}</th>
<td>${_("Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)")}</td>
<td>
<td dir="auto">${_("Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)")}</td>
<td dir="auto">
20%<br />
20c<br />
418T
</td>
</tr>
<tr>
## Translators: This refers to basic mathematical functions such as "square root"
<th scope="row">${_("Basic functions")}</th>
<td>abs, exp, fact or factorial, ln, log2, log10, sqrt</td>
<td>
<td dir="auto">abs, exp, fact or factorial, ln, log2, log10, sqrt</td>
<td dir="auto">
abs(x+y)<br />
sqrt(x^2-y)
</td>
</tr>
<tr>
## Translators: This refers to mathematical Sine, Cosine and Tan
<th scope="row">${_("Trigonometric functions")}</th>
<td>
<td dir="auto">
sin, cos, tan, sec, csc, cot<br />
arcsin, sinh, arcsinh, etc.<br />
</td>
<td>
<td dir="auto">
sin(4x+y)<br />
arccsch(4x+y)
</td>
<td></td>
<td dir="auto"></td>
</tr>
<tr>
## Translators: Please see http://en.wikipedia.org/wiki/Scientific_notation
<th scope="row">${_("Scientific notation")}</th>
## Translators: 10^ is a mathematical symbol. Please do not translate.
<td>${_("10^ and the exponent")}</td>
<td>10^-9</td>
<td dir="auto">${_("10^ and the exponent")}</td>
<td dir="auto">10^-9</td>
</tr>
<tr>
## Translators: this is part of scientific notation. Please see http://en.wikipedia.org/wiki/Scientific_notation#E_notation
<th scope="row">${_("e notation")}</th>
## Translators: 1e is a mathematical symbol. Please do not translate.
<td>${_("1e and the exponent")}</td>
<td>1e-9</td>
<td dir="auto">${_("1e and the exponent")}</td>
<td dir="auto">1e-9</td>
</tr>
</tbody>
</table>