Merge pull request #14 from MarcinOrlowski/dev

Release 1.3.1

Author: MarcinOrlowski

CHANGES.md

@@ -2,7 +2,11 @@
 
 ## CHANGELOG ##
 
-1.3.0 (2018-03-11)
+1.3.1 (2018-03-11)
+==================
+* Fixed bug in `format()` not replacing placeholders
+
+1.3.0 (2018-03-11) (broken!)
 ==================
 * Added support for `%Aa%` placeholder
 

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId 'com.marcinorlowski.datetimetemplate.demo'
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 7
-        versionName '1.3.0'
+        versionCode 8
+        versionName '1.3.1'
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

lib/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 7
-        versionName '1.3.0'
+        versionCode 8
+        versionName '1.3.1'
     }
     lintOptions {
         abortOnError false

lib/src/main/java/com/marcinorlowski/datetimetemplate/DateTimeTemplate.java

@@ -200,7 +200,7 @@ public static String format(Calendar cal, String format, Locale locale) {
 		String result = format;
 		for (Placeholder placeholderKey : Placeholder.values()) {
 			pattern = "%" + placeholderKey.name() + "%";
-			result = format.replaceAll(pattern, map.get(placeholderKey));
+			result = result.replaceAll(pattern, map.get(placeholderKey));
 		}
 
 		// done