From a03298669af57d8ffac3d2f9128f4b879135d5c2 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Mon, 9 Jan 2012 21:47:12 +0400
Subject: [PATCH] release notes + small fixes

---
 AndroidManifest.xml                                      | 4 ++--
 res/values-ru/text_about.xml                             | 9 +++++++++
 res/values/text_about.xml                                | 9 +++++++++
 .../org/solovyev/android/calculator/math/MathType.java   | 4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 31e67800..29353683 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
 		  package="org.solovyev.android.calculator"
 		  a:installLocation="auto"
-		  a:versionCode="24"
-		  a:versionName="1.2.24">
+		  a:versionCode="25"
+		  a:versionName="1.2.25">
 
 	<uses-permission a:name="android.permission.VIBRATE"/>
 	<uses-permission a:name="android.permission.INTERNET"/>
diff --git a/res/values-ru/text_about.xml b/res/values-ru/text_about.xml
index b21fc9ba..da089cfe 100644
--- a/res/values-ru/text_about.xml
+++ b/res/values-ru/text_about.xml
@@ -147,4 +147,13 @@
 		или помочь в переводе приложения на свой родной язык.
 	</string>
 
+	<string name="c_release_notes_for_25">
+		1. Интегрирование функций ln() и lg()\n
+		2. Сохранение последнего открытого таба\n
+		3. Опция \'Удалить\' из контекстного меню в редакторе переменных\n
+		4. Проблема с 1/0\n
+		5. Проблема отображения для прошивок MIUI\n
+		6. Двойной ноль (00)
+	</string>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/text_about.xml b/res/values/text_about.xml
index 8878d2ae..cc440c25 100644
--- a/res/values/text_about.xml
+++ b/res/values/text_about.xml
@@ -147,4 +147,13 @@
 		or help to translate the application to your native language.
 	</string>
 
+	<string name="c_release_notes_for_25">
+		1. Integration of ln() and lg()\n
+		2. Last opened tab is remembered now (history, variables etc)\n
+		3. Remove option from context menu for variables\n
+		4. 1/0 bug\n
+		5. Gui defect for MIUI roms\n
+		6. Double zero (00) key
+	</string>
+
 </resources>
\ No newline at end of file
diff --git a/src/main/java/org/solovyev/android/calculator/math/MathType.java b/src/main/java/org/solovyev/android/calculator/math/MathType.java
index 6bc57afb..5db95224 100644
--- a/src/main/java/org/solovyev/android/calculator/math/MathType.java
+++ b/src/main/java/org/solovyev/android/calculator/math/MathType.java
@@ -7,7 +7,7 @@ package org.solovyev.android.calculator.math;
 
 import jscl.JsclMathEngine;
 import jscl.NumeralBase;
-import jscl.math.function.Constant;
+import jscl.math.function.Constants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.StartsWithFinder;
@@ -125,7 +125,7 @@ public enum MathType {
 
 		@Override
 		protected String getSubstituteFromJscl(@NotNull String match) {
-			return Constant.INF_CONST2.getName().equals(match) ? MathType.INFINITY : super.getSubstituteFromJscl(match);
+			return Constants.INF_2.getName().equals(match) ? MathType.INFINITY : super.getSubstituteFromJscl(match);
 		}
 	},