Fixed #59

emptyValue translation string was being translated before translations were loaded.

Author: SnaveSutit

src/bbmods/faceTint.js

@@ -2,8 +2,8 @@ import { format as modelFormat } from '../modelFormat'
 import { bus } from '../util/bus'
 import * as EVENTS from '../constants/events'
 
-const originalFaceTintCondition = BarItems.face_tint.condition
-const originalFaceTintSliderCondition = BarItems.slider_face_tint.condition
+// const originalFaceTintCondition = BarItems.face_tint.condition
+// const originalFaceTintSliderCondition = BarItems.slider_face_tint.condition
 BarItems.face_tint.condition = () =>
 	!Project.box_uv &&
 	(Format.id === 'java_block' || Format.id === modelFormat.id) &&
@@ -17,8 +17,3 @@ BarItems.slider_face_tint.condition = () =>
 	Cube.selected.length &&
 	UVEditor.selected_faces[0] &&
 	Cube.selected[0].faces[UVEditor.selected_faces[0]]
-
-bus.on(EVENTS.LIFECYCLE.CLEANUP, () => {
-	BarItem.face_tint.condition = originalFaceTintCondition
-	BarItem.slider_face_tint.condition = originalFaceTintSliderCondition
-})

src/modelFormat.js

@@ -310,7 +310,7 @@ const format = new ModelFormat({
 	centered_grid: true,
 	animation_files: true,
 	animated_textures: true,
-	icon: 'fa-cube',
+	icon: 'icon-armor_stand',
 	codec,
 	onDeactivation() {
 		settingsByUUID.set(Project.uuid, settings.toObject())

src/settings.js

@@ -7,9 +7,9 @@ import { getModelPath } from './util/minecraft/resourcepack'
 import { Items } from './util/minecraft/items'
 import { tl } from './util/intl'
 
-const genericEmptyErrorText = tl(
-	'animatedJava.settings.generic.errors.emptyValue'
-)
+function genericEmptyErrorText() {
+	return tl('animatedJava.settings.generic.errors.emptyValue')
+}
 export let ForeignSettingTranslationKeys = {}
 const UNASSIGNED = Symbol('UNASSIGNED_CACHE')
 export const DefaultSettings = {
@@ -33,7 +33,7 @@ export const DefaultSettings = {
 					}
 				} else {
 					d.isValid = false
-					d.error = genericEmptyErrorText
+					d.error = genericEmptyErrorText()
 				}
 				return d
 			},
@@ -105,7 +105,7 @@ export const DefaultSettings = {
 					}
 				} else {
 					d.isValid = false
-					d.error = tl('animatedJava.settings.generic.emptyValue')
+					d.error = genericEmptyErrorText()
 				}
 				return d
 			},
@@ -146,9 +146,7 @@ export const DefaultSettings = {
 					}
 				} else {
 					d.isValid = false
-					d.error = tl(
-						'animatedJava.settings.generic.errors.emptyValue'
-					)
+					d.error = genericEmptyErrorText()
 				}
 				return d
 			},
@@ -185,16 +183,15 @@ export const DefaultSettings = {
 					if (`${rigItem}.json` !== b.base) {
 						d.isValid = false
 						d.error = tl(
-							'animatedJava.settings.predicateFilePath.errors.notEqualToRigItem',{
-								rigItem
+							'animatedJava.settings.predicateFilePath.errors.notEqualToRigItem',
+							{
+								rigItem,
 							}
 						)
 					}
 				} else {
 					d.isValid = false
-					d.error = tl(
-						'animatedJava.settings.generic.errors.emptyValue'
-					)
+					d.error = genericEmptyErrorText()
 				}
 				return d
 			},
@@ -526,7 +523,9 @@ class Settings {
 
 	registerPluginSettings(exporterId, exporterSettingsKey, settings) {
 		DefaultSettings[exporterSettingsKey] = settings
-		ForeignSettingTranslationKeys[exporterSettingsKey] = `${exporterId}.title`
+		ForeignSettingTranslationKeys[
+			exporterSettingsKey
+		] = `${exporterId}.title`
 		this.update(
 			{
 				[exporterSettingsKey]: settings,