← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/fix-json-hardcoded-english into lp:zorba

 

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/fix-json-hardcoded-english into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-json-hardcoded-english/+merge/118443

removed some hardcoded english words from error messages raised by the json parser
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix-json-hardcoded-english/+merge/118443
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/json_loader.cpp'
--- src/store/naive/json_loader.cpp	2012-07-31 10:06:14 +0000
+++ src/store/naive/json_loader.cpp	2012-08-06 23:58:20 +0000
@@ -71,7 +71,7 @@
         jerr::JSDY0040, \
         ERROR_PARAMS( \
           ZED(msg), \
-          BUILD_STRING("line ", e.get_loc().line(), ", column ", e.get_loc().column()) \
+          BUILD_STRING(e.get_loc().line(), ", ", e.get_loc().column()) \
         ) \
      ); \
   } 
@@ -96,7 +96,7 @@
         ERROR_PARAMS( \
           ZED(msg), \
           param, \
-          BUILD_STRING("line ", e.get_loc().line(), ", column ", e.get_loc().column()) \
+          BUILD_STRING(e.get_loc().line(), ", ", e.get_loc().column()) \
         ) \
      ); \
   } 


Follow ups