Update for localization

diff --git a/scilab/modules/graphic_export/macros/driver.sci b/scilab/modules/graphic_export/macros/driver.sci
index 0f23cfc..098802e 100644 (file)
--- a/scilab/modules/graphic_export/macros/driver.sci
+++ b/scilab/modules/graphic_export/macros/driver.sci
@@ -23,7 +23,7 @@ function  [curDriver] = driver(driverName)
     end
     
     if (~checkDriverName(driverName)) then
-      error(gettext("driver: wrong value for first input argument: must be ""Rec"", ""X11"", ""Pos"", ""PPM"", ""GIF"" or ""Fig""."));
+      error(msprintf(gettext("%s: Wrong value for input argument #%d: ''%s'', ''%s'', ''%s'', ''%s'', ''%s'' or ''%s'' expected.\n"),"driver",1,"Rec","X11","Pos","PPM","GIF","Fig"));
      return;
     end
     

diff --git a/scilab/modules/graphic_export/macros/xend.sci b/scilab/modules/graphic_export/macros/xend.sci
index 7fe9895..8b84022 100644 (file)
--- a/scilab/modules/graphic_export/macros/xend.sci
+++ b/scilab/modules/graphic_export/macros/xend.sci
@@ -15,7 +15,7 @@ function xend()
 
   if (%exportFileName == []) then
     // filed not already selected : xinit has not been called
-    error(gettext("xend: xinit must be called before any action."));
+    error(msprintf(gettext("%s: %s must be called before any action.\n"),"xend","xinit"));
     return;
   end
 

diff --git a/scilab/modules/graphic_export/macros/xg2ps.sci b/scilab/modules/graphic_export/macros/xg2ps.sci
index c687ecc..bf234db 100644 (file)
--- a/scilab/modules/graphic_export/macros/xg2ps.sci
+++ b/scilab/modules/graphic_export/macros/xg2ps.sci
@@ -10,7 +10,7 @@
 function xg2ps(figureNumber, fileName)
 
        warnobsolete("xs2ps", "5.1");
-       warning(gettext("""xg2ps"" has been replaced by ""xs2ps"""));
+       warning(msprintf(gettext("""%s"" has been replaced by ""%s"""),"xg2ps","xs2ps"));
        
        xs2ps(figureNumber, fileName);
 

diff --git a/scilab/modules/graphic_export/macros/xinit.sci b/scilab/modules/graphic_export/macros/xinit.sci
index ee27459..81c932d 100644 (file)
--- a/scilab/modules/graphic_export/macros/xinit.sci
+++ b/scilab/modules/graphic_export/macros/xinit.sci
@@ -18,18 +18,19 @@ function  xinit(fileName)
   if (%driverName == "Rec" | %driverName == "X11" | %driverName == "" | %driverName == []) then
     // screen display, should be xinit without argument
     if (rhs <> 0) then
-      error(msprintf(gettext("%s: Wrong number of input arguments: Function has no input argument with ''Rec'' or ''X11'' drivers.\n"), "xinit"));
+      error(msprintf(gettext("%s: Wrong number of input arguments: Function has no input argument with ''%s'' or ''%s'' drivers.\n"), "xinit","Rec","X11"));
     end
     scf();
   else
     // file driver
     if (rhs <> 1) then
-      error(msprintf(gettext("%s: Wrong number of input arguments: A string expected with ''GIF'', ''PPM'', ''POS'' or ''Fig'' drivers.\n"), "xinit"));
+         error(msprintf(gettext("%s: Wrong number of input argument: String expected with ''%s'', ''%s'', ''%s'' or ''%s'' drivers.\n"), "xinit","GIF","PPM","POS","Fig"));
+
     end
 
     if (type(fileName) <> 10) then
       // wrong type for driverName
-      error(msprintf(gettext("%s: Wrong type for input arguments #%d: A string expected with ''GIF'', ''PPM'', ''POS'' or ''Fig'' drivers.\n"), "xinit",1));
+      error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"), "xinit",1));
       return;
     end
   

diff --git a/scilab/modules/graphic_export/macros/xs2emf.sci b/scilab/modules/graphic_export/macros/xs2emf.sci
index 48de892..33b6f94 100644 (file)
--- a/scilab/modules/graphic_export/macros/xs2emf.sci
+++ b/scilab/modules/graphic_export/macros/xs2emf.sci
@@ -13,19 +13,19 @@ function xs2emf(figureNumber, fileName, orientation)
        
        //Input arguments checking
        if rhs <> 2 & rhs <> 3 then
-               error(msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"), "xs2emf",2));
+               error(msprintf(gettext("%s: Wrong number of input arguments: %d to %d expected.\n"), "xs2emf",2,3));
                return;
        end
 
        //first argument checking
        if type(figureNumber) <> 1 | size(figureNumber) <> [1,1] then
-               error(msprintf(gettext("%s: Wrong type for input argument: Integer expected.\n"), "xs2emf"));
+               error(msprintf(gettext("%s: Wrong type for input argument #%d: Integer expected.\n"), "xs2emf",1));
                return;
        end
                
        //second argument checking
        if type(fileName) <> 10 | fileName == "" then
-               error(msprintf(gettext("%s: Wrong type for input argument: String expected.\n"), "xs2emf"));
+               error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"), "xs2emf",2));
                return;
        end
        
@@ -36,7 +36,7 @@ function xs2emf(figureNumber, fileName, orientation)
                elseif orientation == 'p' | orientation == 'portrait' then 
                        orientation = "portrait"; 
                else
-                       error(msprintf(gettext("%s: Wrong input argument #%d: ''%s'' or ''%s'' expected.\n"), "xs2emf", 3, "landscape", "portrait"));
+                       error(msprintf(gettext("%s: Wrong value for input argument #%d: ''%s'' or ''%s'' expected.\n"), "xs2emf", 3, "landscape", "portrait"));
                        return;
                end
        else
@@ -47,7 +47,7 @@ function xs2emf(figureNumber, fileName, orientation)
          // os is a unix one
          // check that pstoedit is available on the computer
          //checkPstoedit = unix_g("which pstoedit");
-         error(msprintf(gettext("%s: EMF format only available on Windows OS.\n"), "xs2emf"));
+         error(msprintf(gettext("%s: EMF format only available under Microsoft Windows OS.\n"), "xs2emf"));
          return;
        end
 

diff --git a/scilab/modules/graphic_export/macros/xs2fig.sci b/scilab/modules/graphic_export/macros/xs2fig.sci
index ea9a0dc..d4cf206 100644 (file)
--- a/scilab/modules/graphic_export/macros/xs2fig.sci
+++ b/scilab/modules/graphic_export/macros/xs2fig.sci
@@ -13,19 +13,19 @@ function xs2fig(figureNumber, fileName, orientation)
        
        //Input arguments checking
        if rhs <> 2 & rhs <> 3 then
-               error(msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"), "xs2emf",2));
+               error(msprintf(gettext("%s: Wrong number of input arguments: %d to %d expected.\n"), "xs2emf",2 ,3));
                return;
        end
 
        //first argument checking
        if type(figureNumber) <> 1 | size(figureNumber) <> [1,1] then
-               error(msprintf(gettext("%s: Wrong type for input argument: Integer expected.\n"), "xs2fig"));
+               error(msprintf(gettext("%s: Wrong type for input argument #%d: Integer expected.\n"), "xs2fig",1));
                return;
        end
                
        //second argument checking
        if type(fileName) <> 10 | fileName == "" then
-               error(msprintf(gettext("%s: Wrong type for input argument: String expected.\n"), "xs2fig"));
+               error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"), "xs2fig",2));
                return;
        end
        
@@ -36,7 +36,7 @@ function xs2fig(figureNumber, fileName, orientation)
                elseif orientation == 'p' | orientation == 'portrait' then 
                        orientation = "portrait"; 
                else
-                       error(msprintf(gettext("%s: Wrong input argument #%d: ''%s'' or ''%s'' expected.\n"), "xs2fig", 3, "landscape", "portrait"));
+                       error(msprintf(gettext("%s: Wrong value for input argument #%d: ''%s'' or ''%s'' expected.\n"), "xs2fig", 3, "landscape", "portrait"));
                        return;
                end
        else

diff --git a/scilab/modules/graphic_export/src/c/xs2file.c b/scilab/modules/graphic_export/src/c/xs2file.c
index de5e253..7504d13 100644 (file)
--- a/scilab/modules/graphic_export/src/c/xs2file.c
+++ b/scilab/modules/graphic_export/src/c/xs2file.c
@@ -61,7 +61,7 @@ int xs2file(char * fname, ExportFileType fileType )
                /* vectorial export with orientation specified */
                if (GetType(3) != sci_strings)
                {
-                       Scierror(999,_("%s: Wrong input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
+                       Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
                    return 0;
                }
                GetRhsVar(3,STRING_DATATYPE,&nbRow,&nbCol,&stackPointer);
@@ -78,7 +78,7 @@ int xs2file(char * fname, ExportFileType fileType )
                }
                else
                {
-                       Scierror(999,_("%s: Wrong input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
+                       Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
                    return 0;
                }
 
@@ -134,4 +134,4 @@ BOOL isVectorialExport(ExportFileType fileType)
                  || fileType == PDF_EXPORT
                  || fileType == SVG_EXPORT;
 }
-/*--------------------------------------------------------------------------*/
\ No newline at end of file
+/*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphic_export/src/nographic_export/nographic_export.c b/scilab/modules/graphic_export/src/nographic_export/nographic_export.c
index 272463e..8169e4d 100644 (file)
--- a/scilab/modules/graphic_export/src/nographic_export/nographic_export.c
+++ b/scilab/modules/graphic_export/src/nographic_export/nographic_export.c
@@ -22,4 +22,3 @@ int gw_graphic_export(void)
        return 0;
 }
 /*--------------------------------------------------------------------------*/ 
-