diff options
Diffstat (limited to 'src/language_tag.cc')
| -rw-r--r-- | src/language_tag.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/language_tag.cc b/src/language_tag.cc index 9ceaba00..2bd77a28 100644 --- a/src/language_tag.cc +++ b/src/language_tag.cc @@ -82,7 +82,7 @@ LanguageTag::Subtag::Subtag (string subtag, SubtagType type) : _subtag (subtag) { if (!get_subtag_data(type, subtag)) { - throw LanguageTagError(String::compose("Unknown %1 string %2", subtag_type_name(type), subtag)); + throw LanguageTagError(compose("Unknown %1 string %2", subtag_type_name(type), subtag)); } } @@ -92,7 +92,7 @@ LanguageTag::LanguageTag (string tag) vector<string> parts; boost::split (parts, tag, boost::is_any_of("-")); if (parts.empty()) { - throw LanguageTagError (String::compose("Could not parse language tag %1", tag)); + throw LanguageTagError (compose("Could not parse language tag %1", tag)); } vector<string>::size_type p = 0; @@ -142,7 +142,7 @@ LanguageTag::LanguageTag (string tag) } catch (...) {} if (p < parts.size()) { - throw LanguageTagError (String::compose("Unrecognised subtag %1", parts[p])); + throw LanguageTagError (compose("Unrecognised subtag %1", parts[p])); } } @@ -201,7 +201,7 @@ void LanguageTag::add_variant (VariantSubtag variant) { if (find(_variants.begin(), _variants.end(), variant) != _variants.end()) { - throw LanguageTagError (String::compose("Duplicate Variant subtag %1", variant.subtag())); + throw LanguageTagError (compose("Duplicate Variant subtag %1", variant.subtag())); } _variants.push_back (variant); @@ -217,7 +217,7 @@ check_for_duplicates (vector<T> const& subtags, dcp::LanguageTag::SubtagType typ optional<T> last; for (auto const& i: sorted) { if (last && i == *last) { - throw LanguageTagError (String::compose("Duplicate %1 subtag %2", dcp::LanguageTag::subtag_type_name(type), i.subtag())); + throw LanguageTagError (compose("Duplicate %1 subtag %2", dcp::LanguageTag::subtag_type_name(type), i.subtag())); } last = i; } @@ -236,7 +236,7 @@ void LanguageTag::add_extlang (ExtlangSubtag extlang) { if (find(_extlangs.begin(), _extlangs.end(), extlang) != _extlangs.end()) { - throw LanguageTagError (String::compose("Duplicate Extlang subtag %1", extlang.subtag())); + throw LanguageTagError (compose("Duplicate Extlang subtag %1", extlang.subtag())); } _extlangs.push_back (extlang); |