Ignore:
Timestamp:
Jul 2, 2015, 6:10:28 PM (9 years ago)
Author:
djay
Message:

Fix issue with rst files displayed from Trac. Fix strings to be translated. Always use the same string in all messages.

Location:
trunk/zoo-project/zoo-kernel
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/zoo-project/zoo-kernel/caching.c

    r695 r725  
    215215            fcontent=(char*)malloc((hInternet->ihandle[index].nDataLen+1)*sizeof(char));
    216216            if(fcontent == NULL){
    217               return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
     217              return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL);
    218218            }
    219219            size_t dwRead;
    … …  
    233233            tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));
    234234            if(tmpMap->value==NULL){
    235               return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
     235              return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL);
    236236            }
    237237            memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
    … …  
    354354  tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));
    355355  if(tmpMap->value==NULL)
    356     return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
     356    return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL);
    357357  memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
    358358

  • trunk/zoo-project/zoo-kernel/locale/po/messages.po

    r722 r725  
    44# Gerald Fenoy <gerald.fenoy@geolabs.fr>, 2015.
    55#
    6 #, fuzzy
    7 msgid ""
    8 msgstr ""
    9 "Project-Id-Version: ZOO-Kernel Internationalization\n"
     6msgid ""
     7msgstr ""
     8"Project-Id-Version: ZOO-Kernel 1.5.0\n"
    109"Report-Msgid-Bugs-To: zoo-discuss@lists.osgeo.org\n"
    11 "POT-Creation-Date: 2015-07-01 22:23+0200\n"
     10"POT-Creation-Date: 2015-07-02 18:06+0200\n"
    1211"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1312"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1918
    2019#: caching.c:217 caching.c:235 caching.c:356 request_parser.c:214
    21 #: request_parser.c:225 request_parser.c:262 request_parser.c:441
    22 #: request_parser.c:537 request_parser.c:562 request_parser.c:665
    23 #: request_parser.c:782 request_parser.c:1112 request_parser.c:1204
    24 #: server_internal.c:1077 zcfg2yaml.c:38 zoo_service_loader.c:259
    25 #: zoo_service_loader.c:880 zoo_service_loader.c:1363
    26 #: zoo_service_loader.c:1559 server_internal.c:1082
    27 msgid "Unable to allocate memory."
    28 msgstr "Unable to allocate memory."
     20#: request_parser.c:225 request_parser.c:262 request_parser.c:403
     21#: request_parser.c:414 request_parser.c:441 request_parser.c:537
     22#: request_parser.c:562 request_parser.c:665 request_parser.c:782
     23#: request_parser.c:1112 request_parser.c:1204 zcfg2yaml.c:38
     24#: zoo_service_loader.c:259 zoo_service_loader.c:880 zoo_service_loader.c:1363
     25#: zoo_service_loader.c:1559
     26msgid "Unable to allocate memory"
     27msgstr "Unable to allocate memory"
    2928
    3029#: caching.c:344
    … …  
    5251msgstr "Unable to find a valid protocol to download the remote file %s"
    5352
    54 #: request_parser.c:403 request_parser.c:414
    55 msgid "Unable to allocate memory"
    56 msgstr "Unable to allocate memory"
    57 
    5853#: request_parser.c:613
    5954msgid "Unable to add a request in the queue."
    … …  
    115110msgstr "are"
    116111
    117 #: response_print.c:1628
     112#: response_print.c:1630
    118113#, c-format
    119114msgid "The service \"%s\" ran successfully."
    120115msgstr "The service \"%s\" ran successfully."
    121116
    122 #: response_print.c:1636
     117#: response_print.c:1638
    123118#, c-format
    124119msgid ""
    … …  
    129124"get the up-to-date status of the service."
    130125
    131 #: response_print.c:1642
    132 #, c-format
    133 msgid ""
     126#: response_print.c:1644
     127#, fuzzy, c-format
     128msgid ""
     129"The service \"%s\" was accepted by the ZOO-Kernel and is running as a "
     130"background task. Please access the URL in the statusLocation attribute "
     131"provided in this document to get the up-to-date status and results."
     132msgstr ""
    134133"The service \"%s\" was accepted by the ZOO kernel and is running as a "
    135134"background task. Please access the URL in the statusLocation attribute "
    136135"provided in this document to get the up-to-date status and results."
    137 msgstr ""
    138 "The service \"%s\" was accepted by the ZOO kernel and is running as a "
    139 "background task. Please access the URL in the statusLocation attribute "
    140 "provided in this document to get the up-to-date status and results."
    141 
    142 #: response_print.c:1659
     136
     137#: response_print.c:1661
    143138msgid "No more information available"
    144139msgstr "No more information available"
    145140
    146 #: response_print.c:1666
     141#: response_print.c:1668
    147142#, c-format
    148143msgid "error code not know : %i\n"
    149144msgstr "error code not know : %i\n"
    150145
    151 #: response_print.c:1758
     146#: response_print.c:1760
    152147msgid "Lock failed."
    153148msgstr "Lock failed."
    154149
    155 #: response_print.c:1771
     150#: response_print.c:1773
    156151#, c-format
    157152msgid "Unable to create the file \"%s\" for storing the ExecuteResponse."
    158153msgstr "Unable to create the file \"%s\" for storing the ExecuteResponse."
    159154
    160 #: response_print.c:2288
     155#: response_print.c:2290
    161156msgid "No debug message available"
    162157msgstr "No debug message available"
    163158
    164 #: response_print.c:2376
     159#: response_print.c:2378
    165160#, c-format
    166161msgid "Unable to create the file \"%s\" for storing the session maps."
    167162msgstr "Unable to create the file \"%s\" for storing the session maps."
    168163
    169 #: response_print.c:2392
     164#: response_print.c:2394
    170165msgid ""
    171166"Unable to run the Service. The message returned back by the Service was the "
    … …  
    175170"following: "
    176171
    177 #: response_print.c:2393
     172#: response_print.c:2395
    178173#, c-format
    179174msgid ""
    … …  
    184179"following: %s"
    185180
    186 #: response_print.c:2396 response_print.c:2397
     181#: response_print.c:2398 response_print.c:2399
    187182msgid ""
    188183"Unable to run the Service. No more information was returned back by the "
    … …  
    192187"Service."
    193188
    194 #: response_print.c:2484
     189#: response_print.c:2486
    195190#, c-format
    196191msgid "Unable to create the file \"%s\" for storing the %s final result."
    197192msgstr "Unable to create the file \"%s\" for storing the %s final result."
    198193
    199 #: response_print.c:2570
     194#: response_print.c:2572
    200195#, c-format
    201196msgid ""
    … …  
    222217msgstr "The job cannot be removed, a file cannot be removed"
    223218
    224 #: server_internal.c:1088 zoo_service_loader.c:276 zoo_service_loader.c:1384
    225 #: zoo_service_loader.c:1427 server_internal.c:1093
     219#: server_internal.c:1063
     220msgid "Unable to open the registry directory."
     221msgstr ""
     222
     223#: server_internal.c:1082
     224msgid "Unable to allocate memory."
     225msgstr "Unable to allocate memory."
     226
     227#: server_internal.c:1093 zoo_service_loader.c:276 zoo_service_loader.c:1384
     228#: zoo_service_loader.c:1427
    226229#, c-format
    227230msgid "Unable to parse the ZCFG file: %s (%s)"
    228231msgstr "Unable to parse the ZCFG file: %s (%s)"
    229232
    230 #: server_internal.c:1091 zoo_service_loader.c:279 zoo_service_loader.c:1389
    231 #: zoo_service_loader.c:1431 server_internal.c:1096
     233#: server_internal.c:1096 zoo_service_loader.c:279 zoo_service_loader.c:1389
     234#: zoo_service_loader.c:1431
    232235#, c-format
    233236msgid "Unable to parse the ZCFG file: %s."
    … …  
    308311
    309312#: zoo_service_loader.c:1238
    310 msgid "The specified path path does not exist."
     313#, fuzzy
     314msgid "The specified path does not exist."
    311315msgstr "The specified path path does not exist."
    312316
    … …  
    359363msgid "Unable to run the child process properly"
    360364msgstr "Unable to run the child process properly"
    361 
    362 #: server_internal.c:1063
    363 msgid "Unable to open the registry directory."
    364 msgstr ""

  • trunk/zoo-project/zoo-kernel/request_parser.c

    r705 r725  
    212212      {
    213213        free(cursor_input);
    214         return errorException (*main_conf, _("Unable to allocate memory."),
     214        return errorException (*main_conf, _("Unable to allocate memory"),
    215215                               "InternalError", NULL);
    216216      }
    … …  
    223223          {
    224224            free(cursor_input);
    225             return errorException (*main_conf, _("Unable to allocate memory."),
     225            return errorException (*main_conf, _("Unable to allocate memory"),
    226226                                   "InternalError", NULL);
    227227          }
    … …  
    260260                    free(cursor_input);
    261261                    return errorException (*main_conf,
    262                                            _("Unable to allocate memory."),
     262                                           _("Unable to allocate memory"),
    263263                                           "InternalError", NULL);
    264264                  }
    … …  
    439439                          return errorException (*main_conf,
    440440                                                 _
    441                                                  ("Unable to allocate memory."),
     441                                                 ("Unable to allocate memory"),
    442442                                                 "InternalError", NULL);
    443443                        }
    … …  
    535535                          return errorException (*main_conf,
    536536                                                 _
    537                                                  ("Unable to allocate memory."),
     537                                                 ("Unable to allocate memory"),
    538538                                                 "InternalError", NULL);
    539539                        }
    … …  
    560560                          return errorException (*main_conf,
    561561                                                 _
    562                                                  ("Unable to allocate memory."),
     562                                                 ("Unable to allocate memory"),
    563563                                                 "InternalError", NULL);
    564564                        }
    … …  
    663663                                      return errorException (*main_conf,
    664664                                                             _
    665                                                              ("Unable to allocate memory."),
     665                                                             ("Unable to allocate memory"),
    666666                                                             "InternalError",
    667667                                                             NULL);
    … …  
    780780                                    return errorException (*main_conf,
    781781                                                           _
    782                                                            ("Unable to allocate memory."),
     782                                                           ("Unable to allocate memory"),
    783783                                                           "InternalError",
    784784                                                           NULL);
    … …  
    11101110          if (tmpmaps == NULL)
    11111111            {
    1112               return errorException (*main_conf, _("Unable to allocate memory."),
     1112              return errorException (*main_conf, _("Unable to allocate memory"),
    11131113                                     "InternalError", NULL);
    11141114            }
    … …  
    12021202              return errorException (*main_conf,
    12031203                                     _
    1204                                      ("Unable to allocate memory."),
     1204                                     ("Unable to allocate memory"),
    12051205                                     "InternalError", NULL);
    12061206            }

  • trunk/zoo-project/zoo-kernel/response_print.c

    r720 r725  
    16421642    case SERVICE_ACCEPTED:
    16431643      nc1 = xmlNewNode(ns, BAD_CAST "ProcessAccepted");
    1644       sprintf(sMsg,_("The service \"%s\" was accepted by the ZOO kernel and is running as a background task. Please access the URL in the statusLocation attribute provided in this document to get the up-to-date status and results."),serv->name);
     1644      sprintf(sMsg,_("The service \"%s\" was accepted by the ZOO-Kernel and is running as a background task. Please access the URL in the statusLocation attribute provided in this document to get the up-to-date status and results."),serv->name);
    16451645      nc3=xmlNewText(BAD_CAST sMsg);
    16461646      xmlAddChild(nc1,nc3);

  • trunk/zoo-project/zoo-kernel/zcfg2yaml.c

    r640 r725  
    3636  s1=(service*)malloc(SERVICE_SIZE);
    3737  if(s1 == NULL){
    38     return errorException(m, _("Unable to allocate memory."),"InternalError",NULL);
     38    return errorException(m, _("Unable to allocate memory"),"InternalError",NULL);
    3939  }
    4040  int t=getServiceFromFile(m,conf_file,&s1);

  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r712 r725  
    257257              {
    258258                dup2 (saved_stdout, fileno (stdout));
    259                 errorException (m, _("Unable to allocate memory."),
     259                errorException (m, _("Unable to allocate memory"),
    260260                                "InternalError", NULL);
    261261                return -1;
    … …  
    878878  if (m == NULL)
    879879    {
    880       return errorException (m, _("Unable to allocate memory."),
     880      return errorException (m, _("Unable to allocate memory"),
    881881                             "InternalError", NULL);
    882882    }
    … …  
    12361236        if (dirp == NULL)
    12371237          {
    1238             errorException (m, _("The specified path path does not exist."),
     1238            errorException (m, _("The specified path does not exist."),
    12391239                            "InvalidParameterValue", conf_dir);
    12401240            freeMaps (&m);
    … …  
    13611361                                    return errorException (m,
    13621362                                                           _
    1363                                                            ("Unable to allocate memory."),
     1363                                                           ("Unable to allocate memory"),
    13641364                                                           "InternalError",
    13651365                                                           NULL);
    … …  
    15571557      free (REQUEST);
    15581558      free (SERVICE_URL);
    1559       return errorException (m, _("Unable to allocate memory."),
     1559      return errorException (m, _("Unable to allocate memory"),
    15601560                             "InternalError", NULL);
    15611561    }
Note: See TracChangeset for help on using the changeset viewer.

Download now !

Search

Context Navigation

Main Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png