Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Keyboards/KeyboardsBase/KeyboardStyling.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func styleBtn(btn: UIButton, title: String, radius: CGFloat) {
btn.layer.masksToBounds = false
btn.layer.cornerRadius = radius
btn.setTitle(title, for: .normal)
if title == invalidCommandMsg {
if title == invalidCommandMsgWikidata || title == invalidCommandMsgWiktionary {
btn.configuration = UIButton.Configuration.plain()
btn.configuration?.baseForegroundColor = UITraitCollection.current.userInterfaceStyle == .light ? specialKeyColor : keyColor
btn.configuration?.image = UIImage(systemName: "info.circle.fill")
Expand Down
8 changes: 4 additions & 4 deletions Keyboards/KeyboardsBase/KeyboardViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,7 @@ class KeyboardViewController: UIInputViewController {
autoCapAtStartOfProxy()

if commandState == .invalid {
commandBar.text = commandPromptSpacing + invalidCommandMsg
commandBar.text = commandPromptSpacing + invalidCommandMsgWikidata
commandBar.isShowingInfoButton = true
} else {
commandBar.isShowingInfoButton = false
Expand All @@ -1868,7 +1868,7 @@ class KeyboardViewController: UIInputViewController {
loadKeys()
proxy.insertText(selectedText)
autoCapAtStartOfProxy()
commandBar.text = commandPromptSpacing + invalidCommandMsg
commandBar.text = commandPromptSpacing + invalidCommandMsgWiktionary
commandBar.isShowingInfoButton = true
commandBar.textColor = keyCharColor
return
Expand Down Expand Up @@ -1902,7 +1902,7 @@ class KeyboardViewController: UIInputViewController {
loadKeys()
proxy.insertText(selectedText)
autoCapAtStartOfProxy()
commandBar.text = commandPromptSpacing + invalidCommandMsg
commandBar.text = commandPromptSpacing + invalidCommandMsgWikidata
commandBar.isShowingInfoButton = true
commandBar.textColor = keyCharColor
return
Expand All @@ -1924,7 +1924,7 @@ class KeyboardViewController: UIInputViewController {

if commandState == .invalid {
proxy.insertText(selectedText)
commandBar.text = commandPromptSpacing + invalidCommandMsg
commandBar.text = commandPromptSpacing + invalidCommandMsgWikidata
commandBar.isShowingInfoButton = true
} else {
commandBar.isShowingInfoButton = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,16 @@ var commandPromptSpacing = ""
var inputWordIsCapitalized = false
var wordToReturn = ""
var potentialWordsToReturn = [String]()
var invalidCommandMsg = ""

var invalidCommandMsgWikidata = ""
var invalidCommandTextWikidata1 = ""
var invalidCommandTextWikidata2 = ""
var invalidCommandTextWikidata3 = ""

var invalidCommandMsgWiktionary = ""
var invalidCommandTextWiktionary1 = ""
var invalidCommandTextWiktionary2 = ""
var invalidCommandTextWiktionary3 = ""

// Annotation variables.
var annotationState = false
Expand Down
15 changes: 4 additions & 11 deletions Keyboards/KeyboardsBase/ToolTip/Model/InformationToolTipData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import UIKit

enum InformationToolTipData {
static let wikiDataExplanation = NSMutableAttributedString(
string: NSLocalizedString("i18n.app.keyboard.not_in_wikidata.explanation_1",
value: "Wikidata is a collaboratively edited knowledge graph that's maintained by the Wikimedia Foundation. It serves as a source of open data for projects like Wikipedia and countless others.",
comment: ""),
string: invalidCommandTextWikidata1,
attributes: [
NSAttributedString.Key.font: UIFont.systemFont(
ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5
Expand All @@ -20,23 +18,18 @@ enum InformationToolTipData {
)

static let wikiDataContationOrigin = NSMutableAttributedString(
string: NSLocalizedString("i18n.app.keyboard.not_in_wikidata.explanation_2",
value: "Scribe uses Wikidata's language data for many of its core features. We get information like noun genders, verb conjugations and much more!",
comment: ""),
string: invalidCommandTextWikidata2,
attributes: [
NSAttributedString.Key.font: UIFont.systemFont(
ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5
)
]
)

static let howToContribute = NSMutableAttributedString(
string: NSLocalizedString("i18n.app.keyboard.not_in_wikidata.explanation_3",
value: "You can make an account at wikidata.org to join the community that's supporting Scribe and so many other projects. Help us bring free information to the world!",
comment: ""),
string: invalidCommandTextWikidata3,
attributes: [
NSAttributedString.Key.font: UIFont.systemFont(
ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.75
ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5
)
]
)
Expand Down
12 changes: 11 additions & 1 deletion Keyboards/LanguageKeyboards/English/ENInterfaceVariables.swift
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,17 @@ func setENKeyboardLayout() {
currencySymbol = "$"
currencySymbolAlternates = dollarAlternateKeys
spaceBar = "space"
invalidCommandMsg = "Not in Wikidata"

invalidCommandMsgWikidata = "Not in Wikidata"
invalidCommandTextWikidata1 = "Wikidata is a collaboratively edited knowledge graph that's maintained by the Wikimedia Foundation. It serves as a source of open data for projects like Wikipedia and countless others."
invalidCommandTextWikidata2 = "Scribe uses Wikidata's language data for many of its core features. We get information like noun genders, verb conjugations and much more!"
invalidCommandTextWikidata3 = "You can make an account at wikidata.org to join the community that's supporting Scribe and so many other projects. Help us bring free information to the world!"

invalidCommandMsgWiktionary = "Not in Wiktionary"
invalidCommandTextWiktionary1 = "Wiktionary is a collaboratively edited dictionary that's maintained by the Wikimedia Foundation. It serves as a source of free linguistic data for projects like Wikipedia and countless others."
invalidCommandTextWiktionary2 = "Scribe uses Wiktionary's data to provide translations for its Translate command. Our data is derived from the many language pairs that Wiktionary's community has created!"
invalidCommandTextWiktionary3 = "You can make an account at wiktionary.org to join the community that's supporting Scribe and so many other projects. Help us bring free information to the world!"

baseAutosuggestions = ["I", "I'm", "we"]
numericAutosuggestions = ["is", "to", "and"]
verbsAfterPronounsArray = ["have", "be", "can"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,17 @@ func setFRKeyboardLayout() {
currencySymbolAlternates = euroAlternateKeys
spaceBar = "espace"
language = "Français"
invalidCommandMsg = "Pas dans Wikidata"

invalidCommandMsgWikidata = "Pas dans Wikidata"
invalidCommandTextWikidata1 = "Wikidata est un réseau de connaissances collaboratif géré par la fondation Wikimedia. Il sert de source de données ouvertes pour des projets tels que Wikipédia et bien d'autres."
invalidCommandTextWikidata2 = "Scribe utilise les données linguistiques de Wikidata pour un grand nombre de ses fonctionnalités de base. Nous obtenons des informations telles que le genre des noms, la conjugaison des verbes et bien plus encore !"
invalidCommandTextWikidata3 = "Vous pouvez créer un compte sur wikidata.org pour rejoindre la communauté qui soutient Scribe et bien d'autres projets. Contribuez à la diffusion d'informations gratuites dans le monde entier !"

invalidCommandMsgWiktionary = "Pas dans Wiktionary"
invalidCommandTextWiktionary1 = "Wiktionary est un dictionnaire collaboratif maintenu par la Fondation Wikimedia. Il sert de source de données linguistiques libres pour des projets comme Wikipédia et bien d'autres."
invalidCommandTextWiktionary2 = "Scribe utilise les données de Wiktionary pour fournir des traductions à sa commande « Traduire ». Nos données proviennent des nombreuses paires de langues créées par la communauté de Wiktionary !"
invalidCommandTextWiktionary3 = "Vous pouvez créer un compte sur wiktionary.org pour rejoindre la communauté qui soutient Scribe et de nombreux autres projets. Aidez-nous à diffuser l'information libre dans le monde entier !"

baseAutosuggestions = ["je", "il", "le"]
numericAutosuggestions = ["je", "que", "c’est"]
verbsAfterPronounsArray = ["être", "avoir", "ne"]
Expand Down
12 changes: 11 additions & 1 deletion Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,17 @@ func setDEKeyboardLayout() {
currencySymbolAlternates = euroAlternateKeys
spaceBar = "Leerzeichen"
language = "Deutsch"
invalidCommandMsg = "Nicht in Wikidata"

invalidCommandMsgWikidata = "Nicht in Wikidata"
invalidCommandTextWikidata1 = "Wikidata ist ein kollaborativ gestalteter, mehrsprachiger Wissensgraf, der von der Wikimedia Foundation gehostet wird. Sie dient als Quelle für offene Daten für unzählige Projekte, beispielsweise Wikipedia."
invalidCommandTextWikidata2 = "Scribe nutzt Sprachdaten von Wikidata für viele Kernfunktionen. Von dort erhalten wir Informationen wie Genera, Verbkonjugationen und viele mehr!"
invalidCommandTextWikidata3 = "Du kannst auf wikidata.org einen Account erstellen, um der Community, die Scribe und viele andere Projekte unterstützt, beizutreten. Hilf uns dabei, der Welt freie Informationen zu geben!"

invalidCommandMsgWiktionary = "Nicht in Wiktionary"
invalidCommandTextWiktionary1 = "Wiktionary ist ein gemeinschaftlich bearbeitetes Wörterbuch, das von der Wikimedia Foundation gepflegt wird. Es dient als Quelle freier Sprachdaten für Projekte wie Wikipedia und unzählige andere."
invalidCommandTextWiktionary2 = "Scribe verwendet die Daten von Wiktionary, um Übersetzungen für den Befehl „Übersetzen“ bereitzustellen. Unsere Daten stammen aus den vielen Sprachpaaren, die die Wiktionary-Community erstellt hat!"
invalidCommandTextWiktionary3 = "Erstellen Sie ein Konto auf wiktionary.org, um der Community beizutreten, die Scribe und viele andere Projekte unterstützt. Helfen Sie uns, freie Informationen in die Welt zu bringen!"

baseAutosuggestions = ["ich", "die", "das"]
numericAutosuggestions = ["Prozent", "Milionen", "Meter"]
verbsAfterPronounsArray = ["haben", "sein", "können"]
Expand Down
12 changes: 11 additions & 1 deletion Keyboards/LanguageKeyboards/Hebrew/HEInterfaceVariables.swift
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,17 @@ func setHEKeyboardLayout() {
currencySymbolAlternates = roubleAlternateKeys
spaceBar = "רווח"
language = "עברית"
invalidCommandMsg = "אין מידע"

invalidCommandMsgWikidata = "אין מידע"
invalidCommandTextWikidata1 = "ויקידאטים הוא גרף ידע שנערך בשיתוף פעולה ומתוחזק על ידי קרן ויקימדיה. הוא משמש כמקור לנתונים פתוחים עבור פרויקטים כמו ויקיפדיה ועוד רבים אחרים."
invalidCommandTextWikidata2 = "סקריב משתמש בנתוני השפה של ויקידאטים עבור רבים מתכונות הליבה שלו. אנו מקבלים מידע כמו מגדרים של שמות עצם, צימוד פעלים ועוד!"
invalidCommandTextWikidata3 = "ניתן ליצור חשבון ב-wikidata.org כדי להצטרף לקהילה התומכת בסקריב ובפרויקטים רבים אחרים. עזרו לנו להביא מידע חופשי לעולם!"

invalidCommandMsgWiktionary = "אין מידע"
invalidCommandTextWiktionary1 = "ויקימיילון הוא מילון שנערך בשיתוף פעולה ומתוחזק על ידי קרן ויקימדיה. הוא משמש כמקור לנתונים לשוניים בחינם עבור פרויקטים כמו ויקיפדיה ועוד רבים אחרים."
invalidCommandTextWiktionary2 = "סקריב משתמש בנתוני ויקימיילון כדי לספק תרגומים לפקודת התרגום שלו. הנתונים שלנו נגזרים מזוגות השפות הרבים שיצרה קהילת ויקימיילון!"
invalidCommandTextWiktionary3 = "ניתן ליצור חשבון ב-wiktionary.org כדי להצטרף לקהילה התומכת בסקריב ובפרויקטים רבים אחרים. עזרו לנו להביא מידע חופשי לעולם!"

baseAutosuggestions = ["אתמ", "אני", "היי"]
numericAutosuggestions = ["", "", ""]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,17 @@ func setIDKeyboardLayout() {
currencySymbol = "$"
currencySymbolAlternates = dollarAlternateKeys
spaceBar = "spasi"
invalidCommandMsg = "Tidak ada di Wikidata"

invalidCommandMsgWikidata = "Tidak ada di Wikidata"
invalidCommandTextWikidata1 = "Wikidata adalah knowledge graph yang diedit secara kolaboratif dan dikelola oleh Wikimedia Foundation. Wikidata berfungsi sebagai sumber data terbuka untuk proyek-proyek seperti Wikipedia dan banyak proyek lainnya."
invalidCommandTextWikidata2 = "Scribe menggunakan data bahasa Wikidata untuk banyak fitur intinya. Kami mendapatkan informasi seperti jenis kelamin kata benda, konjugasi kata kerja, dan banyak lagi!"
invalidCommandTextWikidata3 = "Anda dapat membuat akun di wikidata.org untuk bergabung dengan komunitas yang mendukung Scribe dan banyak proyek lainnya. Bantu kami menghadirkan informasi gratis ke dunia!"

invalidCommandMsgWiktionary = "Tidak ada di Wiktionary"
invalidCommandTextWiktionary1 = "Wiktionary adalah kamus yang diedit secara kolaboratif dan dikelola oleh Wikimedia Foundation. Wiktionary berfungsi sebagai sumber data linguistik gratis untuk proyek-proyek seperti Wikipedia dan banyak proyek lainnya."
invalidCommandTextWiktionary2 = "Scribe menggunakan data Wiktionary untuk menyediakan terjemahan untuk perintah Terjemahannya. Data kami berasal dari banyak pasangan bahasa yang telah dibuat oleh komunitas Wiktionary!"
invalidCommandTextWiktionary3 = "Anda dapat membuat akun di wiktionary.org untuk bergabung dengan komunitas yang mendukung Scribe dan banyak proyek lainnya. Bantu kami menghadirkan informasi gratis ke dunia!"

baseAutosuggestions = ["aku", "saya", "itu"]
numericAutosuggestions = ["adalah", "untuk", "dan"]
verbsAfterPronounsArray = ["sudah", "sedang", "bisa"]
Expand Down
12 changes: 11 additions & 1 deletion Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,17 @@ func setITKeyboardLayout() {
currencySymbolAlternates = euroAlternateKeys
spaceBar = "spazio"
language = "Italiano"
invalidCommandMsg = "Non in Wikidata"

invalidCommandMsgWikidata = "Non in Wikidata"
invalidCommandTextWikidata1 = "Wikidata è un grafo della conoscenza modificabile in modo collaborativo, gestito dalla Wikimedia Foundation. Serve come fonte di dati aperti per progetti come Wikipedia e innumerevoli altri."
invalidCommandTextWikidata2 = "Scribe utilizza i dati linguistici di Wikidata per molte delle sue funzionalità principali. Otteniamo informazioni come il genere dei sostantivi, la coniugazione dei verbi e molto altro!"
invalidCommandTextWikidata3 = "Puoi creare un account su wikidata.org per unirti alla comunità che supporta Scribe e tanti altri progetti. Aiutaci a diffondere informazioni libere in tutto il mondo!"

invalidCommandMsgWiktionary = "Non in Wiktionary"
invalidCommandTextWiktionary1 = "Wiktionary è un dizionario modificato in modo collaborativo e gestito dalla Wikimedia Foundation. Serve come fonte di dati linguistici liberi per progetti come Wikipedia e innumerevoli altri."
invalidCommandTextWiktionary2 = "Scribe utilizza i dati di Wiktionary per fornire traduzioni per il suo comando Traduci. I nostri dati derivano dalle numerose coppie linguistiche create dalla community di Wiktionary!"
invalidCommandTextWiktionary3 = "Puoi creare un account su wiktionary.org per unirti alla community che supporta Scribe e tanti altri progetti. Aiutaci a diffondere informazioni libere in tutto il mondo!"

baseAutosuggestions = ["ho", "non", "ma"]
numericAutosuggestions = ["utenti", "anni", "e"]

Expand Down
12 changes: 11 additions & 1 deletion Keyboards/LanguageKeyboards/Norwegian/NBInterfaceVariables.swift
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,17 @@ func setNBKeyboardLayout() {
currencySymbolAlternates = kronaAlternateKeys
spaceBar = "mellomrom"
language = "Norsk"
invalidCommandMsg = "Ikke i Wikidata"

invalidCommandMsgWikidata = "Ikke i Wikidata"
invalidCommandTextWikidata1 = "Wikidata er en samarbeidsredigert kunnskapsgraf som vedlikeholdes av Wikimedia Foundation. Den fungerer som en kilde til åpne data for prosjekter som Wikipedia og utallige andre."
invalidCommandTextWikidata2 = "Scribe bruker Wikidatas språkdata for mange av kjernefunksjonene. Vi får informasjon som substantivkjønn, verbkonjugasjoner og mye mer!"
invalidCommandTextWikidata3 = "Du kan opprette en konto på wikidata.org for å bli med i fellesskapet som støtter Scribe og mange andre prosjekter. Hjelp oss å bringe gratis informasjon til verden!"

invalidCommandMsgWiktionary = "Ikke i Wiktionary"
invalidCommandTextWiktionary1 = "Wiktionary er en samarbeidsredigert ordbok som vedlikeholdes av Wikimedia Foundation. Den fungerer som en kilde til gratis språkdata for prosjekter som Wikipedia og utallige andre."
invalidCommandTextWiktionary2 = "Scribe bruker Wiktionarys data for å tilby oversettelser for sin Oversett-kommando. Dataene våre er hentet fra de mange språkparene som Wiktionarys fellesskap har laget!"
invalidCommandTextWiktionary3 = "Du kan opprette en konto på wiktionary.org for å bli med i fellesskapet som støtter Scribe og mange andre prosjekter. Hjelp oss å bringe gratis informasjon til verden!"

baseAutosuggestions = ["jeg", "det", "er"]
numericAutosuggestions = ["prosent", "millioner", "meter"]
verbsAfterPronounsArray = ["har", "være", "kan"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,17 @@ func setPTKeyboardLayout() {
currencySymbolAlternates = dollarAlternateKeys
spaceBar = "espaço"
language = "Português"
invalidCommandMsg = "Não está no Wikidata"

invalidCommandMsgWikidata = "Não está no Wikidata"
invalidCommandTextWikidata1 = "A Wikidata é um grafo de conhecimento editado colaborativamente e mantivo pela Fundação Wikimedia. A Wikidata é uma fonte de dados públicos para projetos como a Wikipédia e muitos outros."
invalidCommandTextWikidata2 = "O Scribe usa dados linguísticos da Wikidata para muitas de suas funcionalidades. Temos informações sobre gêneros de substantivos, conjugações de verbos, e muito mais!"
invalidCommandTextWikidata3 = "Você pode criar uma conta em wikidata.org e se juntar à comunidade que apoia o Scribe e muitos outros projetos. Ajude-nos a fornecer dados gratuitos para o mundo!"

invalidCommandMsgWiktionary = "Não está no Wiktionary"
invalidCommandTextWiktionary1 = "O Wikcionário é um dicionário editado colaborativamente e mantido pela Fundação Wikimedia. Ele serve como fonte de dados linguísticos gratuitos para projetos como a Wikipédia e inúmeros outros."
invalidCommandTextWiktionary2 = "O Scribe utiliza os dados do Wikcionário para fornecer traduções para o seu comando Traduzir. Nossos dados são derivados dos diversos pares de idiomas criados pela comunidade do Wikcionário!"
invalidCommandTextWiktionary3 = "Você pode criar uma conta em wiktionary.org para se juntar à comunidade que apoia o Scribe e muitos outros projetos. Ajude-nos a levar informação gratuita para o mundo!"

baseAutosuggestions = ["o", "a", "eu"]
numericAutosuggestions = ["de", "que", "a"]

Expand Down
Loading
Loading