From 7f9eaf0caa584d28de4f777c6ebd35a2e3b36a3c Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 20 Jul 2016 10:58:04 +0300 Subject: [PATCH 1/5] TNL-3798: Removed the subscript note --- lms/templates/calculator/toggle_calculator.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/lms/templates/calculator/toggle_calculator.html b/lms/templates/calculator/toggle_calculator.html index a3c4bbfd30..bed0520f3c 100644 --- a/lms/templates/calculator/toggle_calculator.html +++ b/lms/templates/calculator/toggle_calculator.html @@ -71,8 +71,6 @@ from openedx.core.djangolib.markup import HTML, Text ## Translators: Please do not translate mathematical symbols. ${_("^ (raise to a power)")}
## Translators: Please do not translate mathematical symbols. - ${_("_ (add a subscript)")}
- ## Translators: Please do not translate mathematical symbols. ${_("|| (parallel resistors)")} From 6a3001570e7e2c62cf3b08af93fea988d6a271c7 Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 20 Jul 2016 10:58:33 +0300 Subject: [PATCH 2/5] TNL-3798: Removed the greek letters --- lms/templates/calculator/toggle_calculator.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lms/templates/calculator/toggle_calculator.html b/lms/templates/calculator/toggle_calculator.html index bed0520f3c..2bf519fce0 100644 --- a/lms/templates/calculator/toggle_calculator.html +++ b/lms/templates/calculator/toggle_calculator.html @@ -80,14 +80,6 @@ from openedx.core.djangolib.markup import HTML, Text 1||2 - - ${_("Greek letters")} - ${_("Name of letter")} - - alpha
- lambda - - ${_("Constants")} c, e, g, i, j, k, pi, q, T From ba2e7bb0c70840f327646d9aaa1e30b49d2c56cf Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 20 Jul 2016 11:02:30 +0300 Subject: [PATCH 3/5] Corrected the direction of the English equations --- .../calculator/toggle_calculator.html | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lms/templates/calculator/toggle_calculator.html b/lms/templates/calculator/toggle_calculator.html index 2bf519fce0..64bfaf5b5b 100644 --- a/lms/templates/calculator/toggle_calculator.html +++ b/lms/templates/calculator/toggle_calculator.html @@ -57,7 +57,7 @@ from openedx.core.djangolib.markup import HTML, Text ${_("Fractions")}
${_("Decimals")} - + 2520
2/3
3.14, .98 @@ -66,14 +66,14 @@ from openedx.core.djangolib.markup import HTML, Text ${_("Operators")} ## Translators: Please do not translate mathematical symbols. - + ${_("+ - * / (add, subtract, multiply, divide)")}
## Translators: Please do not translate mathematical symbols. ${_("^ (raise to a power)")}
## Translators: Please do not translate mathematical symbols. ${_("|| (parallel resistors)")} - + x+(2*y)/x-1 x^(n+1)
v_IN+v_OUT
@@ -82,16 +82,16 @@ from openedx.core.djangolib.markup import HTML, Text ${_("Constants")} - c, e, g, i, j, k, pi, q, T - + c, e, g, i, j, k, pi, q, T + 20*c
418*T ${_("Affixes")} - ${_("Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)")} - + ${_("Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)")} + 20%
20c
418T @@ -99,37 +99,37 @@ from openedx.core.djangolib.markup import HTML, Text ${_("Basic functions")} - abs, exp, fact or factorial, ln, log2, log10, sqrt - + abs, exp, fact or factorial, ln, log2, log10, sqrt + abs(x+y)
sqrt(x^2-y) ${_("Trigonometric functions")} - + sin, cos, tan, sec, csc, cot
arcsin, sinh, arcsinh, etc.
- + sin(4x+y)
arccsch(4x+y) - + ## Translators: Please see http://en.wikipedia.org/wiki/Scientific_notation ${_("Scientific notation")} ## Translators: 10^ is a mathematical symbol. Please do not translate. - ${_("10^ and the exponent")} - 10^-9 + ${_("10^ and the exponent")} + 10^-9 ## Translators: this is part of scientific notation. Please see http://en.wikipedia.org/wiki/Scientific_notation#E_notation ${_("e notation")} ## Translators: 1e is a mathematical symbol. Please do not translate. - ${_("1e and the exponent")} - 1e-9 + ${_("1e and the exponent")} + 1e-9 From 185dbd3c9bdd5f511e201156abe3edc6d8892e3f Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 20 Jul 2016 11:45:37 +0300 Subject: [PATCH 4/5] Set the direction of the calculator input to LTR --- lms/static/sass/course/modules/_calculator.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lms/static/sass/course/modules/_calculator.scss b/lms/static/sass/course/modules/_calculator.scss index 6d40743005..37806c24b6 100644 --- a/lms/static/sass/course/modules/_calculator.scss +++ b/lms/static/sass/course/modules/_calculator.scss @@ -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); From 38e35ddf82dbb6681c831bac0343ace3fd12570b Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 20 Jul 2016 12:02:22 +0300 Subject: [PATCH 5/5] Added some comments for the translators in the calculator --- lms/templates/calculator/toggle_calculator.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lms/templates/calculator/toggle_calculator.html b/lms/templates/calculator/toggle_calculator.html index 64bfaf5b5b..287e090cd1 100644 --- a/lms/templates/calculator/toggle_calculator.html +++ b/lms/templates/calculator/toggle_calculator.html @@ -64,6 +64,7 @@ from openedx.core.djangolib.markup import HTML, Text + ## Translators: This refers to mathematical operators such as `plus`, `minus`, `division` and others. ${_("Operators")} ## Translators: Please do not translate mathematical symbols. @@ -81,6 +82,7 @@ from openedx.core.djangolib.markup import HTML, Text + ## Translators: This refers to symbols that are mathematical constants, such as "i" (square root of -1) ${_("Constants")} c, e, g, i, j, k, pi, q, T @@ -89,6 +91,7 @@ from openedx.core.djangolib.markup import HTML, Text + ## Translators: This refers to symbols that appear at the end of a number, such as the percent sign (%) and metric affixes ${_("Affixes")} ${_("Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)")} @@ -98,6 +101,7 @@ from openedx.core.djangolib.markup import HTML, Text + ## Translators: This refers to basic mathematical functions such as "square root" ${_("Basic functions")} abs, exp, fact or factorial, ln, log2, log10, sqrt @@ -106,6 +110,7 @@ from openedx.core.djangolib.markup import HTML, Text + ## Translators: This refers to mathematical Sine, Cosine and Tan ${_("Trigonometric functions")} sin, cos, tan, sec, csc, cot