Merge pull request #411 from VanjaPin/feat/temp-language

feat(temp-language) : temp Chinese language
georgejecook · Oct 19, 2023 · 2bf3640 · 2bf3640
2 parents 04cfbfb + 9bfc9d1
commit 2bf3640
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/source/view/FontManager.bs b/src/source/view/FontManager.bs
@@ -39,6 +39,10 @@ namespace mv
       return invalid
     end function
 
+    function getLanguageCode()
+      return m.getInstance("languageCode") ?? "en"
+    end function
+
     public function getFont(name as string, size as integer) as dynamic
       if name = invalid or name.trim() = ""
         return invalid
@@ -49,7 +53,12 @@ namespace mv
       if font = invalid
         font = CreateObject("roSGNode", "Font")
         if name.instr(".ttf") <> -1
-          font.uri = "pkg:" + "/fonts/" + name
+          language = m.getLanguageCode()
+          if language = "zh"
+            font.uri = "tmp:" + "/fonts/" + name
+          else
+            font.uri = "pkg:" + "/fonts/" + name
+          end if
         else
           'it's a system font
           m.fontLabel.font = "font:" + name + "SystemFont"

diff --git a/src/source/view/FontManager.spec.bs b/src/source/view/FontManager.spec.bs
@@ -2,6 +2,7 @@ import "pkg:/source/tests/ViewBaseTestSuite.spec.bs"
 import "pkg:/source/view/FontManager.bs"
 
 namespace tests
+  @only
   @suite("FontManager tests")
   class FontManagerTests extends mv.tests.BaseTestSuite
 
@@ -30,6 +31,7 @@ namespace tests
     @params("HelveticaNeue.ttf", 30)
     @params("HelveticaNeue.ttf", 30)
     function _(name, size)
+      m.expectOnce(m.manager, "getLanguageCode", [])
       '/* cspell:enable *\
       font = m.manager.getFont(name, size)
       m.assertEqual(font.uri, "pkg:/fonts/" + name)
@@ -52,7 +54,9 @@ namespace tests
     @it("caches font values")
     function _()
       '/* cspell:disable *\
+      m.expectOnce(m.manager, "getLanguageCode", [])
       m.manager.getFont("HelveticaNeue.ttf", 30)
+      m.expectOnce(m.manager, "getLanguageCode", [])
       m.manager.getFont("HelveticaNeue.ttf", 30)
       m.manager.getFont("HelveticaNeue.ttf", 30)
       m.manager.getFont("HelveticaNeue.ttf", 30)
@@ -72,5 +76,20 @@ namespace tests
       m.assertSubType(m.manager.getFont("HelveticaNeue.ttf", 40), "Font")
       '/* cspell:enable *\
     end function
+
+    @it("return tmp language path on zh language code")
+    @params("HelveticaNeue.ttf", 20)
+    @params("HelveticaNeue.ttf", 30)
+    @params("HelveticaNeue.ttf", 50)
+    @params("HelveticaNeue.ttf", 30)
+    @params("HelveticaNeue.ttf", 30)
+    function _(name, size)
+      m.expectOnce(m.manager, "getLanguageCode", [], "zh")
+      '/* cspell:enable *\
+      font = m.manager.getFont(name, size)
+      m.assertEqual(font.uri, "tmp:/fonts/" + name)
+      m.assertEqual(font.size, size)
+      m.assertSubType(font, "Font")
+    end function
   end class
 end namespace