You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/10/11 22:50:01 UTC
[1/2] android commit: fix issue with app_name containing apostrophes
Repository: cordova-android
Updated Branches:
refs/heads/master ca0cbad1c -> be19585c6
fix issue with app_name containing apostrophes
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2cefb425
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2cefb425
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2cefb425
Branch: refs/heads/master
Commit: 2cefb425598aed2b2bf0d742c93a2b8f8ce2ba6b
Parents: 82582e5
Author: Julien Bouquillon <ju...@bouquillon.com>
Authored: Thu Mar 10 18:17:42 2016 +0100
Committer: Julien Bouquillon <ju...@bouquillon.com>
Committed: Mon Mar 14 14:01:43 2016 +0100
----------------------------------------------------------------------
bin/templates/cordova/lib/prepare.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2cefb425/bin/templates/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index 474ffd6..f4e5b85 100644
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -120,7 +120,7 @@ function updateProjectAccordingTo(platformConfig, locations) {
// Update app name by editing res/values/strings.xml
var name = platformConfig.name();
var strings = xmlHelpers.parseElementtreeSync(locations.strings);
- strings.find('string[@name="app_name"]').text = name;
+ strings.find('string[@name="app_name"]').text = name.replace(/\'/g, '\\\'');
fs.writeFileSync(locations.strings, strings.write({indent: 4}), 'utf-8');
events.emit('verbose', 'Wrote out Android application name to "' + name + '"');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] android commit: Merge branch 'fix-appname-apostrophe' of
https://github.com/revolunet/cordova-android
Posted by bo...@apache.org.
Merge branch 'fix-appname-apostrophe' of https://github.com/revolunet/cordova-android
Using a merge commit to merge in a PR
This closes #272
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/be19585c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/be19585c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/be19585c
Branch: refs/heads/master
Commit: be19585c68e424a0363df651998f7935f390e635
Parents: ca0cbad 2cefb42
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Oct 11 15:49:20 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Oct 11 15:49:20 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/prepare.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/be19585c/bin/templates/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --cc bin/templates/cordova/lib/prepare.js
index c689f0e,f4e5b85..a961c82
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@@ -169,9 -120,9 +169,9 @@@ function updateProjectAccordingTo(platf
// Update app name by editing res/values/strings.xml
var name = platformConfig.name();
var strings = xmlHelpers.parseElementtreeSync(locations.strings);
- strings.find('string[@name="app_name"]').text = name;
+ strings.find('string[@name="app_name"]').text = name.replace(/\'/g, '\\\'');
fs.writeFileSync(locations.strings, strings.write({indent: 4}), 'utf-8');
- events.emit('verbose', 'Wrote out Android application name to "' + name + '"');
+ events.emit('verbose', 'Wrote out android application name "' + name + '" to ' + locations.strings);
// Java packages cannot support dashes
var pkg = (platformConfig.android_packageName() || platformConfig.packageName()).replace(/-/g, '_');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org