Merge branch 'localization-part5-introduce-app-string-translations-su…

…pport-and-refactor' into localization-part6-introduce-content-and-answer-translations-support
oppia · Sep 14, 2021 · abb2164 · abb2164
2 parents 2f7dc24 + 6d556fb
commit abb2164
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/assets/file_content_validation_checks.textproto b/scripts/assets/file_content_validation_checks.textproto
@@ -107,14 +107,14 @@ file_content_checks {
   prohibited_content_regex: "(format|getString|getStringArray|getQuantityString|getQuantityText|toLowerCase|toUpperCase|capitalize|decapitalize|lowercase|uppercase)\\("
   failure_message: "String formatting and resource retrieval should go through AppLanguageResourceHandler, OppiaLocale.DisplayLocale, or OppiaLocale.MachineLocale depending on the context (see each class's documentation for details on when each should be used)."
   exempted_file_name: "domain/src/main/java/org/oppia/android/domain/locale/DisplayLocaleImpl.kt"
-  exempted_file_name: "domain/src/main/java/org/oppia/android/domain/locale/MachineLocaleImpl.kt"
   exempted_file_name: "domain/src/main/java/org/oppia/android/domain/locale/OppiaLocale.kt"
   exempted_file_name: "domain/src/main/java/org/oppia/android/domain/util/JsonExtensions.kt"
   exempted_file_name: "domain/src/main/java/org/oppia/android/domain/util/WorkDataExtensions.kt"
   exempted_file_name: "domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt"
   exempted_file_name: "testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt"
   exempted_file_name: "testing/src/main/java/org/oppia/android/testing/time/FakeOppiaClock.kt"
   exempted_file_name: "utility/src/main/java/org/oppia/android/util/extensions/BundleExtensions.kt"
+  exempted_file_name: "utility/src/main/java/org/oppia/android/util/locale/MachineLocaleImpl.kt"
   exempted_file_patterns: "app/src/test/.+?Test\\.kt"
   exempted_file_patterns: "app/src/sharedTest/.+?Test\\.kt"
   exempted_file_patterns: "scripts/.+"

diff --git a/utility/src/main/java/org/oppia/android/util/locale/OppiaLocale.kt b/utility/src/main/java/org/oppia/android/util/locale/OppiaLocale.kt
@@ -81,7 +81,7 @@ sealed class OppiaLocale {
     abstract fun computeDateTimeString(timestampMillis: Long): String
 
     // TODO: mention bidi wrapping (only applied to strings) & machine readable args
-    // TODO: document that receiver is the format (unlike String.format()).
+    // TODO: document that receiver is the format (unlike String.format).
     abstract fun String.formatInLocale(vararg args: Any?): String
 
     abstract fun String.capitalizeForHumans(): String