Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #99185 from Mickeon/documentation-damn-it

Browse Source 
Fix `format` description being different between String and StringName
This commit is contained in:
Thaddeus Crews 2024-11-14 14:51:55 -06:00
commit 0b2a75b995
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/String.xml
View File

@ -248,7 +248,7 @@
<param index="1" name="placeholder" type="String" default="&quot;{_}&quot;" /> <param index="1" name="placeholder" type="String" default="&quot;{_}&quot;" />
<description> <description>
Formats the string by replacing all occurrences of [param placeholder] with the elements of [param values]. Formats the string by replacing all occurrences of [param placeholder] with the elements of [param values].
[param values] can be a [Dictionary], an [Array] or an [Object]. Any underscores in [param placeholder] will be replaced with the corresponding keys in advance. Array elements use their index as keys. [param values] can be a [Dictionary], an [Array], or an [Object]. Any underscores in [param placeholder] will be replaced with the corresponding keys in advance. Array elements use their index as keys.
[codeblock] [codeblock]
# Prints "Waiting for Godot is a play by Samuel Beckett, and Godot Engine is named after it." # Prints "Waiting for Godot is a play by Samuel Beckett, and Godot Engine is named after it."
var use_array_values = "Waiting for {0} is a play by {1}, and {0} Engine is named after it." var use_array_values = "Waiting for {0} is a play by {1}, and {0} Engine is named after it."
@ -265,7 +265,7 @@
[/codeblock] [/codeblock]
When passing an [Object], the property names from [method Object.get_property_list] are used as keys. When passing an [Object], the property names from [method Object.get_property_list] are used as keys.
[codeblock] [codeblock]
# Prints: Visible true, position (0, 0). # Prints "Visible true, position (0, 0)"
var node = Node2D.new() var node = Node2D.new()
print("Visible {visible}, position {position}".format(node)) print("Visible {visible}, position {position}".format(node))
[/codeblock] [/codeblock]

8
doc/classes/StringName.xml
View File

@ -231,7 +231,7 @@
<param index="1" name="placeholder" type="String" default="&quot;{_}&quot;" /> <param index="1" name="placeholder" type="String" default="&quot;{_}&quot;" />
<description> <description>
Formats the string by replacing all occurrences of [param placeholder] with the elements of [param values]. Formats the string by replacing all occurrences of [param placeholder] with the elements of [param values].
[param values] can be a [Dictionary] or an [Array]. Any underscores in [param placeholder] will be replaced with the corresponding keys in advance. Array elements use their index as keys. [param values] can be a [Dictionary], an [Array], or an [Object]. Any underscores in [param placeholder] will be replaced with the corresponding keys in advance. Array elements use their index as keys.
[codeblock] [codeblock]
# Prints "Waiting for Godot is a play by Samuel Beckett, and Godot Engine is named after it." # Prints "Waiting for Godot is a play by Samuel Beckett, and Godot Engine is named after it."
var use_array_values = "Waiting for {0} is a play by {1}, and {0} Engine is named after it." var use_array_values = "Waiting for {0} is a play by {1}, and {0} Engine is named after it."
@ -246,6 +246,12 @@
print("User {} is {}.".format([42, "Godot"], "{}")) print("User {} is {}.".format([42, "Godot"], "{}"))
print("User {id} is {name}.".format([["id", 42], ["name", "Godot"]])) print("User {id} is {name}.".format([["id", 42], ["name", "Godot"]]))
[/codeblock] [/codeblock]
When passing an [Object], the property names from [method Object.get_property_list] are used as keys.
[codeblock]
# Prints "Visible true, position (0, 0)"
var node = Node2D.new()
print("Visible {visible}, position {position}".format(node))
[/codeblock]
See also the [url=$DOCS_URL/tutorials/scripting/gdscript/gdscript_format_string.html]GDScript format string[/url] tutorial. See also the [url=$DOCS_URL/tutorials/scripting/gdscript/gdscript_format_string.html]GDScript format string[/url] tutorial.
[b]Note:[/b] Each replacement is done sequentially for each element of [param values], [b]not[/b] all at once. This means that if any element is inserted and it contains another placeholder, it may be changed by the next replacement. While this can be very useful, it often causes unexpected results. If not necessary, make sure [param values]'s elements do not contain placeholders. [b]Note:[/b] Each replacement is done sequentially for each element of [param values], [b]not[/b] all at once. This means that if any element is inserted and it contains another placeholder, it may be changed by the next replacement. While this can be very useful, it often causes unexpected results. If not necessary, make sure [param values]'s elements do not contain placeholders.
[codeblock] [codeblock]