Merge pull request #28901 from fcampo/fix-strings-1141479

Bug 1141479 - Fix string for default activities (r=etienne, flod)

apps/sharedtest/test/unit/default_activity_helper_test.js

@@ -21,7 +21,7 @@ suite('Default Activity Helper', function() {
     test('returns config if supported', function() {
       var config = DefaultActivityHelper.getDefaultConfig('view', 'url');
       assert.ok(config);
-      assert.equal(config.settingsId, 'activity.default.openurl');
+      assert.equal(config.settingsId, 'activity.default.viewurl');
     });
 
     test('returns undefined if not supported', function() {
@@ -32,7 +32,7 @@ suite('Default Activity Helper', function() {
 
   suite('getDefaultAction', function(done) {
     test('setting is recovered for supported activity', function(done) {
-      var settingsHelper = SettingsHelper('activity.default.openurl', null);
+      var settingsHelper = SettingsHelper('activity.default.viewurl', null);
       settingsHelper.set('manifest');
       DefaultActivityHelper.getDefaultAction('view', 'url').then((action) => {
         assert.equal(action, 'manifest');
@@ -50,7 +50,7 @@ suite('Default Activity Helper', function() {
 
   suite('setDefaultAction', function(done) {
     test('setting is set for supported action', function(done) {
-      var settingsHelper = SettingsHelper('activity.default.openurl', null);
+      var settingsHelper = SettingsHelper('activity.default.viewurl', null);
       DefaultActivityHelper.setDefaultAction('view', 'url', 'testmanifest');
       settingsHelper.get(function(value) {
         assert.equal(value, 'testmanifest');

shared/js/default_activity_helper.js

@@ -14,31 +14,47 @@
     //   l10nId: 'default-activity-pickimage',
     //   settingsId: 'activity.default.pickimage'
     // },
-    // Note: list of supported activities on bug1039386
+    //
+    // NOTE: due to specs (bug1039386), some actions are grouped so when an app
+    // is set as default for any of the actions, the rest (from the same group)
+    // will be assigned the same app as default launch too.
+    // Grouped actions:
+    //
+    // new "webcontacts/contact"
+    // open "webcontacts/contact"
+    // update "webcontacts/contact"
+    //
+    // new "mail"
+    // view “url” (email)
+    //
+    // open "video"
+    // view “video”
+    //
     var supportedActivities = [
       {
         name: 'dial',
         type: ['webtelephony/number'],
-        l10nId: 'default-activity-makecall',
-        settingsId: 'activity.default.makecall'
+        l10nId: 'default-activity-dialnumber',
+        settingsId: 'activity.default.dialnumber'
       },
       {
         name: 'new',
         type: ['webcontacts/contact'],
         l10nId: 'default-activity-opencontact',
         settingsId: 'activity.default.opencontact'
+        // same as open contact, see previous note
       },
       {
         name: 'new',
         type: ['mail'],
-        l10nId: 'default-activity-sendmail',
-        settingsId: 'activity.default.sendmail'
+        l10nId: 'default-activity-newmail',
+        settingsId: 'activity.default.newmail'
       },
       {
         name: 'new',
         type: ['websms/sms'],
-        l10nId: 'default-activity-sendmessage',
-        settingsId: 'activity.default.sendmessage'
+        l10nId: 'default-activity-newsms',
+        settingsId: 'activity.default.newsms'
       },
       {
         name: 'open',
@@ -75,26 +91,26 @@
       {
         name: 'record',
         type: ['photos'],
-        l10nId: 'default-activity-takephoto',
-        settingsId: 'activity.default.takephoto'
+        l10nId: 'default-activity-recordphoto',
+        settingsId: 'activity.default.recordphoto'
       },
       {
         name: 'record',
         type: ['videos'],
-        l10nId: 'default-activity-takevideo',
-        settingsId: 'activity.default.takevideo'
+        l10nId: 'default-activity-recordvideo',
+        settingsId: 'activity.default.recordvideo'
       },
       {
         name: 'view',
         type: ['url'],
-        l10nId: 'default-activity-openurl',
-        settingsId: 'activity.default.openurl'
+        l10nId: 'default-activity-viewurl',
+        settingsId: 'activity.default.viewurl'
       },
       {
         name: 'view',
         type: ['application/pdf'],
-        l10nId: 'default-activity-openpdf',
-        settingsId: 'activity.default.openpdf'
+        l10nId: 'default-activity-viewpdf',
+        settingsId: 'activity.default.viewpdf'
       },
       {
         name: 'view',
@@ -104,12 +120,14 @@
                'video/youtube'],
         l10nId: 'default-activity-openvideo',
         settingsId: 'activity.default.openvideo'
+        // same as open video, see previous note
       },
       {
         name: 'update',
         type: ['webcontacts/contact'],
         l10nId: 'default-activity-opencontact',
         settingsId: 'activity.default.opencontact'
+        // same as open contact, see previous note
       }
     ];
 

shared/locales/activities/activities.en-US.properties

@@ -1,31 +1,35 @@
 # Default activities label
 
-# PICK
-default-activity-pickimage    = Take picture
+# LOCALIZATION NOTE These strings are used to describe available actions that
+#   can be associated by default to an application.
+#   e.g. "Open link" -> Firefox
+#        "Open image"-> Gallery
+#
 
 # DIAL
-default-activity-makecall     = Make call
+default-activity-dialnumber     = Make call
 
 # NEW
-default-activity-opencontact  = Open contact
-default-activity-sendmail     = Send email
-default-activity-sendmessage  = Send message
+# default-activity-newcontact same as default-activity-opencontact
+default-activity-newmail        = Send email
+default-activity-newsms         = Send message
 
 # OPEN
-default-activity-opencontact  = Open contact
-default-activity-openimage    = Open image
-default-activity-openaudio    = Open audio
-default-activity-openvideo    = Open video
+default-activity-opencontact    = Open contact
+default-activity-openimage      = Open image
+default-activity-openaudio      = Open audio
+default-activity-openvideo      = Open video
 
 # RECORD
-default-activity-takephoto    = Take photo
-default-activity-takevideo    = Record video
+default-activity-recordphoto    = Take photo
+default-activity-recordvideo    = Record video
 
 # VIEW
-default-activity-openurl      = Open link
-default-activity-openpdf      = Open PDF file
-default-activity-openvideo    = Open video
+default-activity-viewurl        = Open link
+# default-activity-viewurl-email same as default-activity-newmail
+default-activity-viewpdf        = Open PDF file
+# default-activity-viewvideo same as default-activity-openvideo
 
 # UPDATE
-default-activity-opencontact  = Open contact
+# default-activity-updatecontact same as default-activity-opencontact