@quenty/clienttranslator 14.8.0 → 14.9.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/clienttranslator@14.8.0...@quenty/clienttranslator@14.9.0) (2024-10-04)
+
+
+### Bug Fixes
+
+* Localization should change whenever entries change ([9d2f0b7](https://github.com/Quenty/NevermoreEngine/commit/9d2f0b7a41d97902520a0adb41bfeab85cce3302))
+* Output parsing was wrong for LocalizationEntryParserUtils ([8de8872](https://github.com/Quenty/NevermoreEngine/commit/8de8872d5ef9c432bc91b581f8534810fd32f0e7))
+
+
+
+
+
 # [14.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/clienttranslator@14.7.0...@quenty/clienttranslator@14.8.0) (2024-09-25)
 
 **Note:** Version bump only for package @quenty/clienttranslator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/clienttranslator",
-  "version": "14.8.0",
+  "version": "14.9.0",
   "description": "Gets local translator for player",
   "keywords": [
     "Roblox",
@@ -25,20 +25,20 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/blend": "^12.7.0",
-    "@quenty/instanceutils": "^13.7.0",
-    "@quenty/loader": "^10.5.0",
-    "@quenty/maid": "^3.3.0",
-    "@quenty/promise": "^10.5.0",
-    "@quenty/promisemaid": "^5.5.0",
+    "@quenty/blend": "^12.8.0",
+    "@quenty/instanceutils": "^13.8.0",
+    "@quenty/loader": "^10.6.0",
+    "@quenty/maid": "^3.4.0",
+    "@quenty/promise": "^10.6.0",
+    "@quenty/promisemaid": "^5.6.0",
     "@quenty/pseudolocalize": "^3.4.0",
-    "@quenty/rx": "^13.7.0",
+    "@quenty/rx": "^13.8.0",
     "@quenty/string": "^3.3.0",
     "@quenty/table": "^3.5.0",
-    "@quenty/valueobject": "^13.7.0"
+    "@quenty/valueobject": "^13.8.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9b17fe79cddd071f0f06a9d35184e76b44bd6fe6"
+  "gitHead": "035abfa088c854a73e1c65b350267eaa17669646"
 }

package/src/Shared/Conversion/LocalizationEntryParserUtils.lua

@@ -82,29 +82,32 @@ function LocalizationEntryParserUtils._parseTableToResultsList(lookupTable, sour
 		elseif type(text) == "string" then
 			local found = lookupTable[key]
 			if found then
-				found.Values[localeId] = key
+				found.Values[localeId] = text
 			else
-				-- Guarantee the context is unique. This is important because Roblox will not
-				-- allow something with the same source without a differing context text.
-				local context = string.format("Generated from %s with key %s", tableName, key)
-
 				found = {
-					Context = context;
 					Example = text;
 					Key = key;
-					Source = sourceLocaleId;
+					Context = string.format("[TEMP] - Generated from %s with key %s", tableName, key);
+					Source = text; -- Tempt!
 					Values = {
 						[localeId] = text;
 					};
 				};
 
-				if RunService:IsStudio() and sourceLocaleId == localeId then
-					found.Values[PseudoLocalize.getDefaultPseudoLocaleId()] = PseudoLocalize.pseudoLocalize(text)
-				end
-
 				lookupTable[key] = found;
 			end
 
+			-- Ensure assignment
+			if sourceLocaleId == localeId then
+				-- Guarantee the context is unique. This is important because Roblox will not
+				-- allow something with the same source without a differing context text.
+				found.Context = string.format("Generated from %s with key %s", tableName, key)
+				found.Source = text
+
+				if RunService:IsStudio() then
+					found.Values[PseudoLocalize.getDefaultPseudoLocaleId()] = PseudoLocalize.pseudoLocalize(text)
+				end
+			end
 		else
 			error(string.format("Bad type for text at key '%s'", key))
 		end

package/src/Shared/JSONTranslator.lua

@@ -100,12 +100,13 @@ function JSONTranslator:Init(serviceBag)
 		self._localizationTable:SetEntryExample(item.Key, item.Source, item.Context, item.Example)
 	end
 
-	self._maid:GiveTask(RxInstanceUtils.observeProperty(self._localizationTable, "SourceLocaleId"):Subscribe(function(localeId)
-		self._sourceTranslator.Value = self._localizationTable:GetTranslator(localeId)
-	end))
+	-- TODO: Maybe don't hold these unless needed
 	self._maid:GiveTask(self._translatorService:ObserveLocaleId():Subscribe(function(localeId)
 		self._localTranslator.Value = self._localizationTable:GetTranslator(localeId)
 	end))
+	self._maid:GiveTask(RxInstanceUtils.observeProperty(self._localizationTable, "SourceLocaleId"):Subscribe(function(localeId)
+		self._sourceTranslator.Value = self._localizationTable:GetTranslator(localeId)
+	end))
 end
 
 --[=[
@@ -119,13 +120,17 @@ function JSONTranslator:ObserveFormatByKey(translationKey, translationArgs)
 	assert(type(translationKey) == "string", "Key must be a string")
 
 	return Rx.combineLatest({
-		translator = self:ObserveTranslator();
+		cloudTranslator = self:ObserveTranslator();
 		translationKey = translationKey;
 		translationArgs = self:_observeArgs(translationArgs);
 	}):Pipe({
 		Rx.switchMap(function(mainState)
-			if mainState.translator then
-				return Rx.of(self:_doTranslation(mainState.translator, mainState.translationKey, mainState.translationArgs))
+			if mainState.cloudTranslator then
+				return self._translatorService:ObserveLocaleId():Pipe({
+					Rx.map(function()
+						return self:_doTranslation(mainState.cloudTranslator, mainState.translationKey, mainState.translationArgs)
+					end);
+				})
 			end
 
 			-- Fall back to local or source translator

package/src/Shared/TranslatorService.lua

@@ -119,7 +119,13 @@ end
 	@return Observable<string>
 ]=]
 function TranslatorService:ObserveLocaleId()
-	return self._translator:Observe():Pipe({
+	if self._localeIdValue then
+		return self._localeIdValue:Observe()
+	end
+
+	self._localeIdValue = self._maid:Add(ValueObject.new("en-us", "string"))
+
+	self._localeIdValue:Mount(self._translator:Observe():Pipe({
 		Rx.switchMap(function(translator)
 			if translator then
 				return RxInstanceUtils.observeProperty(translator, "LocaleId")
@@ -137,7 +143,9 @@ function TranslatorService:ObserveLocaleId()
 			end
 		end);
 		Rx.distinct();
-	})
+	}))
+
+	return self._localeIdValue:Observe()
 end
 
 --[=[