AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1220 allows - for -f and -t (same as not giving them).

Browse Source 
more documentation.
changed some error messages.

X-SVN-Rev: 7694
This commit is contained in:
Yves Arrouye 2002-02-16 18:45:11 +00:00
parent 0c98108e83
commit 6f2c114b83
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icu4c/source/extra/uconv/root.txt
View File

@ -1,6 +1,6 @@
// -*- Coding: utf-8; -*- [all uconv resource files]
// Copyright (c) 2000 IBM, Inc. and Others.
// $Revision: 1.24 $
// $Revision: 1.25 $
//
// Root translation file for uconv messages.
// So you want to translate this file??? Great!
@ -87,16 +87,16 @@ root
// ICU errors - used by u_wmsg_errorName()
U_USING_FALLBACK_ERROR { "Using fallback data." }
U_USING_DEFAULT_ERROR { "Using default data." }
U_ZERO_ERROR { "No error has occured!" }
U_ILLEGAL_ARGUMENT_ERROR { "Illegal argument!" }
U_USING_FALLBACK_ERROR { "Using fallback data" }
U_USING_DEFAULT_ERROR { "Using default data" }
U_ZERO_ERROR { "No error has occured" }
U_ILLEGAL_ARGUMENT_ERROR { "Illegal argument" }
U_MISSING_RESOURCE_ERROR { "A resource was missing" }
U_INVALID_FORMAT_ERROR { "Invalid format." }
U_FILE_ACCESS_ERROR { "Problem accessing that file/object." }
U_INTERNAL_PROGRAM_ERROR { "Internal program error!!" }
U_INVALID_FORMAT_ERROR { "Invalid format" }
U_FILE_ACCESS_ERROR { "Problem accessing that file/object" }
U_INTERNAL_PROGRAM_ERROR { "Internal program error" }
U_MESSAGE_PARSE_ERROR { "Parse error on message format" }
U_MEMORY_ALLOCATION_ERROR { "Out of memory!" }
U_MEMORY_ALLOCATION_ERROR { "Out of memory" }
U_INDEX_OUTOFBOUNDS_ERROR { "An index was out-of-bounds" }
U_PARSE_ERROR { "Parse error" }
U_INVALID_CHAR_FOUND { "Invalid character found" }

10
icu4c/source/extra/uconv/uconv.1.in
View File

@ -84,9 +84,17 @@ to another.
The transcoding is done using Unicode as a pivot encoding
(i.e. the data are first transcoded from their original encoding to
Unicode, and then from Unicode to the destination encoding).
.PP
If an
.I encoding
is not specified, the default encoding is used.
is not specified or is
.BR - ,
the default encoding is used. Thus, calling
.B uconv
with no
.I encoding
provides an easy way to validate and sanitize data files for
further consumption by tools requiring data in the default encoding.
.PP
When calling
.BR uconv ,

4
icu4c/source/extra/uconv/uconv.cpp
View File

@ -885,10 +885,10 @@ int main(int argc, char **argv)
return printTransliterators(pname, printCanon) ? 3 : 0;
}
if (!fromcpage) {
if (!fromcpage || !uprv_strcmp(fromcpage, "-")) {
fromcpage = ucnv_getDefaultName();
}
if (!tocpage) {
if (!tocpage || !uprv_strcmp(tocpage, "-")) {
tocpage = ucnv_getDefaultName();
}