Fix issue processing malformated strings in messages.js

Author: carlosperate

blockly/i18n/common.py

@@ -125,6 +125,7 @@ def _create_lang_file(author, lang, output_dir, ardublockly=False):
     Raises:
         IOError: An error occurred while opening or writing the file.
     """
+    qqq_name = 'qqq' + ('_ardublockly' if ardublockly else '')
     lang_file_name = lang + ('_ardublockly.json' if ardublockly else '.json')
     lang_file_name = os.path.join(os.curdir, output_dir, lang_file_name)
     lang_file = codecs.open(lang_file_name, 'w', 'utf-8')
@@ -135,8 +136,8 @@ def _create_lang_file(author, lang, output_dir, ardublockly=False):
 \t\t"author": "{0}",
 \t\t"lastupdated": "{1}",
 \t\t"locale": "{2}",
-\t\t"messagedocumentation" : "qqq"
-""".format(author, str(datetime.now()), lang))
+\t\t"messagedocumentation" : "{3}"
+""".format(author, str(datetime.now()), lang, qqq_name))
     lang_file.write('\t},\n')
     return lang_file
 

blockly/i18n/js_to_json.py

@@ -47,9 +47,9 @@
 import re
 from common import write_files, write_files_ardublockly
 
-
+# Original RegEx kept as a reminder that it'll conflict when upstreamed pulled
 #_INPUT_DEF_PATTERN = re.compile("""Blockly.Msg.(\w*)\s*=\s*'([^']*)';?$""")
-_INPUT_DEF_PATTERN = re.compile("""Blockly.Msg.(\w*)\s*=\s*'([^']*)';[\r\n]+$""")
+_INPUT_DEF_PATTERN = re.compile("""Blockly.Msg.(\w*)\s*=\s*'(.*)';?\r?$""")
 
 _INPUT_SYN_PATTERN = re.compile(
     """Blockly.Msg.(\w*)\s*=\s*Blockly.Msg.(\w*);""")
@@ -114,7 +114,9 @@ def main():
     write_files(args.author, args.lang, args.output_dir, results, False)
 
   # Create synonyms.json.
-  synonym_file_name = os.path.join(os.curdir, args.output_dir, 'synonyms.json')
+  synonym_name = 'synonyms' + \
+                 ('_ardublockly.json' if args.ardublockly else '.json')
+  synonym_file_name = os.path.join(os.curdir, args.output_dir, synonym_name)
   with open(synonym_file_name, 'w') as outfile:
     json.dump(synonyms, outfile)
   if not args.quiet:

blockly/msg/messages_ardublockly.js

@@ -29,6 +29,7 @@ goog.require('Blockly.Msg');
  * message descriptor.  The build process extracts these descriptors, adds
  * them to msg/json/qqq_ardublockly.json, and they show up in the translation
  * console.
+ * Note the strings have to be surrounded by single quotation marks: ''
  */
 
 /// Ardublockly Types
@@ -79,7 +80,7 @@ Blockly.Msg.ARD_SERIAL_SETUP_TIP = 'Selects the speed for a specific Serial peri
 Blockly.Msg.ARD_SERIAL_PRINT = 'print';
 Blockly.Msg.ARD_SERIAL_PRINT_NEWLINE = 'add new line';
 Blockly.Msg.ARD_SERIAL_PRINT_TIP = 'Prints data to the console/serial port as human-readable ASCII text.';
-Blockly.Msg.ARD_SERIAL_PRINT_WARN = 'A setup block for %1 must be added to the workspace to use this block!'
+Blockly.Msg.ARD_SERIAL_PRINT_WARN = 'A setup block for %1 must be added to the workspace to use this block!';
 Blockly.Msg.ARD_SERVO_WRITE = 'set SERVO from Pin';
 Blockly.Msg.ARD_SERVO_WRITE_TO = 'to';
 Blockly.Msg.ARD_SERVO_WRITE_DEG_180 = 'Degrees (0~180)';
@@ -108,13 +109,13 @@ Blockly.Msg.ARD_SPI_TRANSRETURN_TIP = 'Send a SPI message to an specified slave
 Blockly.Msg.ARD_STEPPER_SETUP = 'Setup stepper motor';
 Blockly.Msg.ARD_STEPPER_MOTOR = 'stepper motor:';
 Blockly.Msg.ARD_STEPPER_DEFAULT_NAME = 'MyStepper';
-Blockly.Msg.ARD_STEPPER_NUMBER_OF_PINS = "Number of pins";
-Blockly.Msg.ARD_STEPPER_TWO_PINS = "2";
-Blockly.Msg.ARD_STEPPER_FOUR_PINS = "4";
+Blockly.Msg.ARD_STEPPER_NUMBER_OF_PINS = 'Number of pins';
+Blockly.Msg.ARD_STEPPER_TWO_PINS = '2';
+Blockly.Msg.ARD_STEPPER_FOUR_PINS = '4';
 Blockly.Msg.ARD_STEPPER_PIN1 = 'pin1#';
 Blockly.Msg.ARD_STEPPER_PIN2 = 'pin2#';
-Blockly.Msg.ARD_STEPPER_PIN3 = "pin3#";
-Blockly.Msg.ARD_STEPPER_PIN4 = "pin4#";
+Blockly.Msg.ARD_STEPPER_PIN3 = 'pin3#';
+Blockly.Msg.ARD_STEPPER_PIN4 = 'pin4#';
 Blockly.Msg.ARD_STEPPER_REVOLVS = 'how many steps per revolution';
 Blockly.Msg.ARD_STEPPER_SPEED = 'set speed (rpm) to';
 Blockly.Msg.ARD_STEPPER_SETUP_TIP = 'Configures a stepper motor pinout and other settings.';
@@ -133,7 +134,7 @@ Blockly.Msg.ARD_TIME_MILLIS_TIP = 'Returns the number of milliseconds since the
 Blockly.Msg.ARD_TIME_MICROS = 'current elapsed Time (microseconds)';
 Blockly.Msg.ARD_TIME_MICROS_TIP = 'Returns the number of microseconds since the Arduino board began running the current program. Has to be stored in a positive long integer';
 Blockly.Msg.ARD_TIME_INF = 'wait forever (end program)';
-Blockly.Msg.ARD_TIME_INF_TIP = 'Wait indefinitely, stopping the program.'
+Blockly.Msg.ARD_TIME_INF_TIP = 'Wait indefinitely, stopping the program.';
 Blockly.Msg.ARD_VAR_AS = 'as';
 Blockly.Msg.ARD_VAR_AS_TIP = 'Sets a value to a specific type';
 Blockly.Msg.ARD_PULSEREAD = 'Read';