Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: handles translation keys that have only one word (i.e. no spaces… #596

Merged
merged 3 commits into from
Jun 23, 2022
Merged

fix: handles translation keys that have only one word (i.e. no spaces… #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90878ce
fix: handles translation keys that have only one word (i.e. no spaces…
BHSDuncan May 11, 2022
21f026b
fix: fixes dialogue that starts with a space
BHSDuncan May 12, 2022
e06c95a
fix: issues warning if translation key cannot be found (same for a vo…
BHSDuncan May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion addons/escoria-core/game/core-scripts/esc/types/esc_command.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ func _init(command_string):
parameters.append(
parameter
)
elif ":" in parameter and '"' in parameter:
elif ':"' in parameter and (parameter.ends_with(':"') or not parameter.ends_with('"')):
# The second clause in this helps to handle dialogue that starts with a space
# and also allowing single-word dialogue to be handled in a separate elif.
quote_open = true
parameter_values.append(parameter)
elif not quote_open and parameter.begins_with('"'):
Expand Down
31 changes: 28 additions & 3 deletions addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ var _dialog_manager: ESCDialogManager = null
var _keytext_regex: RegEx = RegEx.new()


# Constructor
func _init() -> void:
_keytext_regex.compile(KEYTEXT_REGEX)


# Register the dialog player and load the dialog resources
func _ready():
_keytext_regex.compile(KEYTEXT_REGEX)
if !Engine.is_editor_hint():
escoria.dialog_player = self

Expand Down Expand Up @@ -131,12 +135,33 @@ func say(character: String, type: String, text: String) -> void:
var _speech_resource = _get_voice_file(
matches.get_string("key")
)
if _speech_resource != "":
if _speech_resource == "":
escoria.logger.report_warnings(
"esc_dialog_player.gd:say",
[
"Unable to find voice file with key '%s'." % matches.get_string("key")
]
)
else:
(
escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
as ESCSpeechPlayer
).set_state(_speech_resource)
text = tr(matches.get_string("key"))

var translated_text: String = tr(matches.get_string("key"))

# Only update the text if the translated text was found; otherwise, raise
# a warning and use the original, untranslated text.
if translated_text == matches.get_string("key"):
escoria.logger.report_warnings(
"esc_dialog_player.gd:say",
[
"Unable to find translation key '%s'. Using untranslated text." % matches.get_string("key")
]
)
text = matches.get_string("text")
else:
text = translated_text
else:
text = matches.get_string("text")

Expand Down