beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb+Base: Convert String::format() to String::formatted()

Browse source 
This error page template is slightly hilarious and should probably
be replaced with AK::SourceGenerator or some such, but for now let's
just get rid of the call to String::format().
This commit is contained in:
Andreas Kling 2021-04-21 23:35:24 +02:00
parent e924da6c73
commit 9a8dd38493
Notes: sideshowbarker 2024-07-18 19:15:44 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/9a8dd38493f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Base/res/html/error.html
View file

@ -14,8 +14,8 @@
<body>
<header>
<img src="file:///res/icons/32x32/msgbox-warning.png" alt="Warning" width="24" height="24">
<h1>Failed to load %s</h1>
<h1>Failed to load {}</h1>
</header>
<p>Error: %s</p>
<p>Error: {}</p>
</body>
</html>

8
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -227,10 +227,10 @@ void FrameLoader::load_error_page(const URL& failed_url, const String& error)
[this, failed_url, error](auto data, auto&, auto) {
VERIFY(!data.is_null());
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
auto html = String::format(
String::copy(data).characters(),
escape_html_entities(failed_url.to_string()).characters(),
escape_html_entities(error).characters());
auto html = String::formatted(
data,
escape_html_entities(failed_url.to_string()),
escape_html_entities(error));
#pragma GCC diagnostic pop
auto document = HTML::parse_html_document(html, failed_url, "utf-8");
VERIFY(document);