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

[Matthias Brantner]

removed some hardcoded english words from error messages raised by the json parser

removed some hardcoded english words from error messages raised by the json parser

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-json-hardcoded-english-2012-08-06T23-59-04.176Z/log.html

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix-json-hardcoded-english-2012-08-06T23-59-04.176Z is finished. The final status was:

All tests succeeded!

=== 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()) \
         ) \
      ); \
   }