fix #3710

MightyPirates · Apr 19, 2024 · ad76e2a · ad76e2a
1 parent 479b301
commit ad76e2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/build.properties b/build.properties
@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1614-1.7.10
 
-oc.version=1.8.4-snapshot
+oc.version=1.8.5-snapshot
 
 ae2.version=rv2-stable-10
 bc.version=7.1.24

diff --git a/changelog.md b/changelog.md
@@ -1,22 +1,6 @@
-## New features
-
-* (1.7.10) [#3524] Add support for reading Thaumcraft aspect information from Wands. (repo-alt)
-* Improve OpenOS "package" implementation:
- * [#3447] Populate package.config, add support for the package.preload table. (RobertCochran)
- * Add support for the package.searchers table.
-
 ## Fixes/improvements
 
-* [CVE-2024-31446] Fixed Lua virtual machine freeze involving xpcall().
-* (1.12.2) [#3659] Fixed bug when programatically transferring fluids from specific tanks. (yut23)
-* [#3664] Fixed client-side errors when using third-party mod energy integration on an integrated server.
-* [#3677] Fixed crash when showing error containing a percent sign with the Analyzer item.
-* [#3698] Fixed documentation for the Screen's "turnOn" and "turnOff" functions. (Hawk777, DCNick3)
-* [#3663] Fixed response code/message information not being preserved for unsuccessful HTTP responses.
-* [#3691] Improved documentation for software bundled with the "network" floppy. (Computerdores)
-* [#3644] Improved forged packet protection with regards to configuring server racks. (Glease)
-* [#3652] Updated French translation. (ff66theone)
-* Updated GNU Unifont to 15.1.05.
+* [#3710] Fix localization regression introduced in 1.8.4.
 
 ## List of contributors
 

diff --git a/src/main/resources/assets/opencomputers/loot/openos/lib/core/boot.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/core/boot.lua
@@ -1,7 +1,7 @@
 -- called from /init.lua
 local raw_loadfile = ...
 
-_G._OSVERSION = "OpenOS 1.8.4"
+_G._OSVERSION = "OpenOS 1.8.5"
 
 -- luacheck: globals component computer unicode _OSVERSION
 local component = component

diff --git a/src/main/scala/li/cil/oc/Localization.scala b/src/main/scala/li/cil/oc/Localization.scala
@@ -13,7 +13,10 @@ import scala.util.matching.Regex
 object Localization {
  private val nl = Regex.quote("[nl]")
 
- private def resolveKey(key: String) = if (canLocalize(Settings.namespace + key)) Option(Settings.namespace + key) else Option.empty
+ private def resolveKey(key: String) =
+ if (canLocalize(Settings.namespace + key)) Option(Settings.namespace + key)
+ else if (canLocalize(key)) Option(key)
+ else Option.empty
 
  def canLocalize(key: String) = StatCollector.canTranslate(key)