diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2017-09-07 16:35:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-07 16:35:24 -0400 |
commit | 9d5decab5c4c721cdcd16bbd02d5daf8a8a3c1e0 (patch) | |
tree | 03b627d84218f6e0c2dc468ec1f3ddf943773c7a /src/components/policy/policy_external | |
parent | 36a45c9310b920e361a464545bc102eb1f0ebfc4 (diff) | |
parent | 60f57672d36c84b805d2e40481be1555e3e6ffa8 (diff) | |
download | sdl_core-9d5decab5c4c721cdcd16bbd02d5daf8a8a3c1e0.tar.gz |
Merge pull request #1624 from AKalinich-Luxoft/fix/fix_messages_default_language_checking
Fix Consumer friendly message default language checking
Diffstat (limited to 'src/components/policy/policy_external')
-rw-r--r-- | src/components/policy/policy_external/include/policy/policy_table/types.h | 2 | ||||
-rw-r--r-- | src/components/policy/policy_external/src/policy_table/types.cc | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/components/policy/policy_external/include/policy/policy_table/types.h b/src/components/policy/policy_external/include/policy/policy_table/types.h index a460db32db..53f5a35b99 100644 --- a/src/components/policy/policy_external/include/policy/policy_table/types.h +++ b/src/components/policy/policy_external/include/policy/policy_table/types.h @@ -372,7 +372,7 @@ struct MessageLanguages : CompositeType { private: bool Validate() const; - static const std::string kMandatoryLanguage_; + static const std::string default_language_; }; struct ConsumerFriendlyMessages : CompositeType { diff --git a/src/components/policy/policy_external/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc index e66b2cb561..da83626448 100644 --- a/src/components/policy/policy_external/src/policy_table/types.cc +++ b/src/components/policy/policy_external/src/policy_table/types.cc @@ -916,7 +916,7 @@ void MessageString::SetPolicyTableType(PolicyTableType pt_type) { } // MessageLanguages methods -const std::string MessageLanguages::kMandatoryLanguage_("en-us"); +const std::string MessageLanguages::default_language_("en-us"); MessageLanguages::MessageLanguages() : CompositeType(kUninitialized) {} @@ -940,7 +940,7 @@ bool MessageLanguages::is_valid() const { return false; } // Each RPC must have message in english - if (languages.end() == languages.find(kMandatoryLanguage_)) { + if (languages.end() == languages.find(default_language_)) { return false; } return Validate(); @@ -973,9 +973,10 @@ void MessageLanguages::ReportErrors(rpc::ValidationReport* report__) const { if (!languages.is_valid()) { languages.ReportErrors(&report__->ReportSubobject("languages")); } - if (languages.end() == languages.find(kMandatoryLanguage_)) { - report__->set_validation_info("no mandatory language '" + - kMandatoryLanguage_ + "' is present"); + if (languages.end() == languages.find(default_language_)) { + report__->set_validation_info( + "this message does not support the default language '" + + default_language_ + "'"); } } |