Merge branch 'location' into mobileapp

1 files changed, 16 insertions, 0 deletions

diff --git a/objects.js b/objects.js
index 0913357..49fafb5 100644
--- a/objects.js
+++ b/objects.js
@@ -903,6 +903,16 @@ SpriteMorph.prototype.initBlocks = function () {
             category: 'sensing',
             spec: 'current acceleration along the z axes'
         },
+        reportLanguage: {
+            type: 'reporter',
+            category: 'sensing',
+            spec: 'language'
+        },
+        reportLocation: {
+            type: 'reporter',
+            category: 'sensing',
+            spec: 'location %locations'
+        },
 
         // Operators
         reifyScript: {
@@ -1910,6 +1920,9 @@ SpriteMorph.prototype.blockTemplates = function (category) {
         blocks.push('-');
         blocks.push(block('reportDate'));
         blocks.push('-');
+        blocks.push(block('reportLanguage'));
+        blocks.push(block('reportLocation'));
+        blocks.push('-');
         blocks.push(block('doVibrate'));
         blocks.push('-');
         blocks.push(block('reportCompassHeading'));
@@ -5027,6 +5040,9 @@ StageMorph.prototype.blockTemplates = function (category) {
         blocks.push('-');
         blocks.push(block('reportDate'));
         blocks.push('-');
+        blocks.push(block('reportLanguage'));
+        blocks.push(block('reportLocation'));
+        blocks.push('-');
         blocks.push(block('doVibrate'));
         blocks.push('-');
         blocks.push(block('reportCompassHeading'));