Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[iOS] - Fix an issue with reader-mode page language not specified (#27676)

Browse Source
This commit is contained in:
Brandon-T
2025-02-22 11:45:44 -08:00
committed by GitHub
parent f416070457
commit e16c0dc838
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/brave-ios/Sources/Brave/Frontend/Reader/Reader.html
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
<html>
<html lang="%READER-PAGE-LANGUAGE%">
<head>
<meta content="text/html; charset=UTF-8" http-equiv="content-type">
ios/brave-ios/Sources/Brave/Frontend/Reader/ReaderModeUtils.swift
+5
View File
@@ -33,6 +33,11 @@ struct ReaderModeUtils {
.replacingOccurrences(of: "%READER-STYLE%", with: initialStyle.encode())
.replacingOccurrences(of: "%READER-DOMAIN%", with: simplifyDomain(readabilityResult.domain))
.replacingOccurrences(of: "%READER-URL%", with: readabilityResult.url)
.replacingOccurrences(
of: "%READER-PAGE-LANGUAGE%",
with: readabilityResult.documentLanguage.javaScriptEscapedString?.unquotedIfNecessary
?? ""
)
.replacingOccurrences(
of: "%READER-TITLE%",
with: readabilityResult.title.javaScriptEscapedString?.unquotedIfNecessary
ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Sandboxed/MainFrame/AtDocumentStart/ReaderModeScript.js
+5
View File
@@ -88,6 +88,11 @@ function checkReadability() {
readabilityResult.cspMetaTags = [...cspMetaTags].map((e) => new XMLSerializer().serializeToString(e));
}
let documentLanguage = document.documentElement.lang || document.querySelector('meta[http-equiv="Content-Language"]')?.content || null;
if (documentLanguage) {
readabilityResult.documentLanguage = documentLanguage;
}
debug({Type: "ReaderModeStateChange", Value: readabilityResult !== null ? "Available" : "Unavailable"});
webkit.messageHandlers.readerModeMessageHandler.postMessage({"securityToken": SECURITY_TOKEN, "data": {Type: "ReaderModeStateChange", Value: readabilityResult !== null ? "Available" : "Unavailable"}});
webkit.messageHandlers.readerModeMessageHandler.postMessage({"securityToken": SECURITY_TOKEN, "data": {Type: "ReaderContentParsed", Value: readabilityResult}});
ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/ReaderModeScriptHandler.swift
+8 -1
View File
@@ -169,6 +169,7 @@ struct ReadabilityResult {
var domain = ""
var url = ""
var content = ""
var documentLanguage = ""
var title = ""
var credits = ""
var direction = "auto"
@@ -191,6 +192,9 @@ struct ReadabilityResult {
if let content = dict["content"] as? String {
self.content = content
}
if let documentLanguage = dict["documentLanguage"] as? String {
self.documentLanguage = documentLanguage
}
if let title = dict["title"] as? String {
self.title = title
}
@@ -214,6 +218,7 @@ struct ReadabilityResult {
let domain = object["domain"].string
let url = object["url"].string
let content = object["content"].string
let documentLanguage = object["documentLanguage"].string
let title = object["title"].string
let credits = object["credits"].string
let direction = object["dir"].string
@@ -226,6 +231,7 @@ struct ReadabilityResult {
self.domain = domain!
self.url = url!
self.content = content!
self.documentLanguage = documentLanguage ?? ""
self.title = title!
self.credits = credits!
self.direction = direction ?? "auto"
@@ -235,7 +241,8 @@ struct ReadabilityResult {
/// Encode to a dictionary, which can then for example be json encoded
func encode() -> [String: Any] {
return [
"domain": domain, "url": url, "content": content, "title": title, "credits": credits,
"domain": domain, "url": url, "content": content, "documentLanguage": documentLanguage,
"title": title, "credits": credits,
"dir": direction, "cspMetaTags": cspMetaTags,
]
}