Skip to content

Commit 959b379

Browse files
#1 Cordova-Android 4 compatibility
1 parent 1735907 commit 959b379

File tree

10 files changed

+54
-4
lines changed

10 files changed

+54
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
xcuserdata/
1313
project.xcworkspace/
1414
tags
15+
.idea

plugin.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
id="com.synconset.imagepicker"
5-
version="1.0.6">
5+
version="1.0.7">
66

77
<name>ImagePicker</name>
88

@@ -106,5 +106,13 @@
106106
<source-file src="src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml" target-dir="res/values-hu"/>
107107
<source-file src="src/android/Library/res/values-ja/multiimagechooser_strings_ja.xml" target-dir="res/values-ja"/>
108108
<source-file src="src/android/Library/res/values-ko/multiimagechooser_strings_ko.xml" target-dir="res/values-ko"/>
109+
110+
<!-- TODO added for Telerik LiveSync, should be able to remove these when LS uses translatable="false" -->
111+
<source-file src="src/android/Library/res/values-de/strings.xml" target-dir="res/values-de"/>
112+
<source-file src="src/android/Library/res/values-es/strings.xml" target-dir="res/values-es"/>
113+
<source-file src="src/android/Library/res/values-fr/strings.xml" target-dir="res/values-fr"/>
114+
<source-file src="src/android/Library/res/values-hu/strings.xml" target-dir="res/values-hu"/>
115+
<source-file src="src/android/Library/res/values-ja/strings.xml" target-dir="res/values-ja"/>
116+
<source-file src="src/android/Library/res/values-ko/strings.xml" target-dir="res/values-ko"/>
109117
</platform>
110118
</plugin>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">ImagePicker</string>
4+
<string name="LiveSyncToken">ignore</string>
5+
<string name="Host">https://app.icenium.com/appbuilder</string>
6+
<string name="Telerik_LiveSync_CustomUrlSchemePrefix">icenium:</string>
7+
</resources>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">ImagePicker</string>
4+
<string name="LiveSyncToken">ignore</string>
5+
<string name="Host">https://app.icenium.com/appbuilder</string>
6+
<string name="Telerik_LiveSync_CustomUrlSchemePrefix">icenium:</string>
7+
</resources>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">ImagePicker</string>
4+
<string name="LiveSyncToken">ignore</string>
5+
<string name="Host">https://app.icenium.com/appbuilder</string>
6+
<string name="Telerik_LiveSync_CustomUrlSchemePrefix">icenium:</string>
7+
</resources>

src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="multi_app_name">MultiImageChooser</string>
4-
54
<string name="free_version_label">Ingyenes verzió - hátralévő képek: %d</string>
65
<string name="error_database">Képadatbázis megnyitási hiba történt. Kérjük, jelentse a problémát.</string>
76
<string name="requesting_thumbnails">Miniatűrök lekérése, kérjük legyen türelemmel</string>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">ImagePicker</string>
4+
<string name="LiveSyncToken">ignore</string>
5+
<string name="Host">https://app.icenium.com/appbuilder</string>
6+
<string name="Telerik_LiveSync_CustomUrlSchemePrefix">icenium:</string>
7+
</resources>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">ImagePicker</string>
4+
<string name="LiveSyncToken">ignore</string>
5+
<string name="Host">https://app.icenium.com/appbuilder</string>
6+
<string name="Telerik_LiveSync_CustomUrlSchemePrefix">icenium:</string>
7+
</resources>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">ImagePicker</string>
4+
<string name="LiveSyncToken">ignore</string>
5+
<string name="Host">https://app.icenium.com/appbuilder</string>
6+
<string name="Telerik_LiveSync_CustomUrlSchemePrefix">icenium:</string>
7+
</resources>

src/android/Library/res/values/multiimagechooser_strings_en.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<string name="free_version_label">Free version - Images left: %d</string>
55
<string name="error_database">There was an error opening the images database. Please report the problem.</string>
66
<string name="requesting_thumbnails">Requesting thumbnails, please be patient</string>
7-
<string name="discard">Cancel</string>
8-
<string name="done">OK</string>
7+
<string name="discard" translatable="false">Cancel</string>
8+
<string name="done" translatable="false">OK</string>
99
</resources>

0 commit comments

Comments
 (0)