Fix Consumer friendly message default language checking

If “en-us” is not present for any message, the table shall be rejected,
PM should log error and shut SDL down. However this works only for external
policies.
Added missed checks for regular policies.
kMandatoryLanguage was renamed to default_language_

1 files changed, 6 insertions, 5 deletions

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 d7dd986abc..a02f1efe9d 100644
--- a/src/components/policy/policy_external/src/policy_table/types.cc
+++ b/src/components/policy/policy_external/src/policy_table/types.cc
@@ -890,7 +890,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) {}
 
@@ -914,7 +914,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();
@@ -947,9 +947,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_ + "'");
   }
 }