Merge "Translate the rest of the math functions." into jb-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e5038a9..9313894 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -73,10 +73,16 @@
<string name="pi">\u03c0</string>
<!-- Displayed on buttons on screen for the e function. -->
<string name="e">e</string>
+ <!-- Do not translate. What we replace translated e with for calculating e. -->
+ <string translate="false" name="e_mathematical_value">e</string>
<!-- Displayed on buttons on screen for the ln function. -->
<string name="ln">ln</string>
+ <!-- Do not translate. What we replace translated ln with for calculating ln. -->
+ <string translate="false" name="ln_mathematical_value">ln</string>
<!-- Displayed on buttons on screen for the log function. -->
<string name="lg">log</string>
+ <!-- Do not translate. What we replace translated lg with for calculating lg. -->
+ <string translate="false" name="lg_mathematical_value">lg</string>
<!-- Displayed on buttons on screen for a left parenthesis. -->
<string name="leftParen">(</string>
<!-- Displayed on buttons on screen for a right parenthesis. -->
diff --git a/src/com/android/calculator2/Logic.java b/src/com/android/calculator2/Logic.java
index e2657fe..a91090c 100644
--- a/src/com/android/calculator2/Logic.java
+++ b/src/com/android/calculator2/Logic.java
@@ -265,6 +265,9 @@
addTranslation(map, R.string.sin, R.string.sin_mathematical_value);
addTranslation(map, R.string.cos, R.string.cos_mathematical_value);
addTranslation(map, R.string.tan, R.string.tan_mathematical_value);
+ addTranslation(map, R.string.e, R.string.e_mathematical_value);
+ addTranslation(map, R.string.ln, R.string.ln_mathematical_value);
+ addTranslation(map, R.string.lg, R.string.lg_mathematical_value);
mTranslationsSet = map.entrySet();
}
for (Entry<String, String> entry : mTranslationsSet) {
