cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [2/2] android commit: Merge branch 'fix-appname-apostrophe' of https://github.com/revolunet/cordova-android
Date Tue, 11 Oct 2016 22:50:02 GMT
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 <bowserj@apache.org>
Authored: Tue Oct 11 15:49:20 2016 -0700
Committer: Joe Bowser <bowserj@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


Mime
View raw message