Permalink
Browse files

Merge pull request #7334 from vingtetun/827294

Bug 827294 - [Settings] permission string IDs must not contain colon ':'...
  • Loading branch information...
2 parents 550e477 + 27eff38 commit 844bcf7eaf8751da6f558c025d6d7113a1b32b07 @vingtetun vingtetun committed Jan 7, 2013
View
@@ -229,7 +229,7 @@ var ApplicationsList = {
var item = document.createElement('li');
var content = document.createElement('span');
- content.textContent = _('perm-' + perm);
+ content.textContent = _('perm-' + perm.replace(':', '-'));
var select = document.createElement('select');
select.dataset.perm = perm;
@@ -47,7 +47,7 @@ var PermissionManager = (function() {
var str = '';
var _ = navigator.mozL10n.get;
- var permissionName = _('perm-' + detail.permission);
+ var permissionName = _('perm-' + detail.permission.replace(':', '-'));
if (detail.isApp) {
// App
@@ -1,8 +1,8 @@
perm-contacts=Contacts
perm-desktop-notification=Notifications
-perm-device-storage:music=Music Storage
-perm-device-storage:pictures=Pictures Storage
-perm-device-storage:sdcard=SD Card Storage
-perm-device-storage:videos=Videos Storage
+perm-device-storage-music=Music Storage
+perm-device-storage-pictures=Pictures Storage
+perm-device-storage-sdcard=SD Card Storage
+perm-device-storage-videos=Videos Storage
perm-fmradio=FM Radio
perm-geolocation=Geolocation

0 comments on commit 844bcf7

Please sign in to comment.