diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index beb5f214dd..e63a7b53d6 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -98,7 +98,6 @@ jobs: "18-standard-models", "20-search-preference", "marketdescription", - "ankidroid-titles", ]; let stringsLabel = "Strings"; diff --git a/docs/marketing/localized_description/ankidroid-titles.txt b/docs/marketing/localized_description/ankidroid-titles.txt deleted file mode 100644 index a17ca617d9..0000000000 --- a/docs/marketing/localized_description/ankidroid-titles.txt +++ /dev/null @@ -1,44 +0,0 @@ -AnkiDroid Flashcards -af: AnkiDroid Flitskaarte -ar: البطاقات التعليميةآنكيدرويد -az: AnkiDroid Flaş Kartları -be: Карткі для запамінання AnkiDroid -bg: AnkiDroid Флашкарти -ca: AnkiDroid fitxes per memoritzar -cs: AnkiDroid kartičky -de: AnkiDroid Karteikarten -eo: AnkiDroid -es-AR: Tarjetas flash AnkiDroid -es-ES: Tarjetas AnkiDroid -et: AnkiDroid mälukaardid -fa: فلش کارتهای انکی دروید -fi: AnkiDroid-muistikortit -fr: AnkiDroid (Cartes mémoire) -fy-NL: AnkiDroid flitskaarten -gl: Cartóns AnkiDroid -he: קלפי לימוד של AnkiDroid -he: קלפי לימוד של AnkiDroid -hi: AnkiDroid फ़्लैशकार्ड -hu: AnkiDroid Szókártyák -hy-AM: AnkiDroid քարտեր -id: Kartu Flash AnkiDroid -ka: AnkiDroid: სამეცადინო ბარათები -kk: AnkiDroid жаттау карталары -ko: AnkiDroid 플래시 카드 -lt: „AnkiDroid“ atminties kortelės -mr: अंकीड्रोएड फ़्लँशकार्डस् -ms: Kad Imbasan AnkiDroid -nl: AnkiDroid flitskaarten -pl: AnkiDroid – Fiszki -ru: AnkiDroid: карточки для запоминания -sc: Cartas mnemònicas de AnkiDroid -sk: AnkiDroid kartičky -sl: Pomnilne kartice AnkiDroid -sr: AnkiDroid флеш-картице -sv-SE: AnkiDroid Flashkort -th: บัตรคำ AnkiDroid -tr: AnkiDroid Bilgi Kartları -ur-PK: آنکی ڈیرائڈ فلیشکارڈز -vi: Thẻ thông minh AnkiDroid -zh-CN: AnkiDroid 记忆卡片 -zh-TW: AnkiDroid 單字卡 \ No newline at end of file diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt index 50dfb7cee0..272a01bb1d 100644 --- a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt +++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt @@ -50,7 +50,7 @@ class TranslationTypo : ResourceXmlDetector(), XmlScanner { ) // copied from tools/localization/src/constants.ts - // excludes ankidroid-titles and marketdescription as these are .txt + // excludes marketdescription as it is .txt private val I18N_FILES = listOf( "01-core", "02-strings", diff --git a/tools/chromeos/release.sh b/tools/chromeos/release.sh deleted file mode 100755 index 2756d1542f..0000000000 --- a/tools/chromeos/release.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# Check if jq exists -command -v jq >/dev/null 2>&1 || { echo >&2 "This script requires jq (http://stedolan.github.io/jq/) but it's not installed. Aborting."; exit 1; } - -# Check opts -if [ $# -eq 0 ]; then - echo "missing path to apk_to_crx.py conversion script (get it from https://console.developers.google.com/storage/browser/arc-sdk/ for the current stable version of Chrome)" - exit 1 -elif [ $# -eq 1 ]; then - echo "missing path to apk file" - exit 1 -fi - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -SOURCE_PATH=${SCRIPT_PATH%/*/*} - -# Make sure cws directory exists -mkdir -p cws - -# Use --for-webstore instead of --unpacked to remove potential debug stuff -python2 $1 --metadata $SCRIPT_PATH/release.crx.json --for-webstore --output cws/build.zip --destructive $2 - -# Unzip CWS package -rm -rf cws/unpacked -unzip -q cws/build.zip -d cws/unpacked -rm cws/build.zip - -# Optimize image for CWS -cp $SOURCE_PATH/docs/marketing/chrome-web-store/icon.png cws/unpacked/ - -# Add short name and description placeholder to manifest -echo "`jq '.short_name = "AnkiDroid" | .description = "__MSG_extDesc__"' cws/unpacked/manifest.json`" > cws/unpacked/manifest.json - -# Extract name and description from ankidroid-titles.txt and marketdescription-XY.txt and -# inject them into extName and extDesc of messages.json in _locales/XY -LANGS=`ls cws/unpacked/_locales` -DEFAULT_NAME='AnkiDroid Flashcards' -DEFAULT_DESC='Memorize anything with AnkiDroid!' -for LANG in $LANGS -do - if [ -f $SOURCE_PATH/docs/marketing/localized_description/marketdescription-$LANG.txt ] - then - NAME=`grep "^$LANG:" $SOURCE_PATH/docs/marketing/localized_description/ankidroid-titles.txt | sed 's/.*\: //'` - DESC=`head -n 1 $SOURCE_PATH/docs/marketing/localized_description/marketdescription-$LANG.txt` - echo "`jq '.extName.message = $extName | .extDesc.message = $extDesc' --arg extName "${NAME:-DEFAULT_NAME}" --arg extDesc "${DESC-DEFAULT_DESC}" cws/unpacked/_locales/$LANG/messages.json`" > cws/unpacked/_locales/$LANG/messages.json - else - echo "`jq '.extName.message = $extName | .extDesc.message = $extDesc' --arg extName "$DEFAULT_NAME" --arg extDesc "$DEFAULT_DESC" cws/unpacked/_locales/$LANG/messages.json`" > cws/unpacked/_locales/$LANG/messages.json - fi -done - -# Work around intent filter restriction to support APKG file handler -echo "`jq 'del(.file_handlers.any.types) | .file_handlers.any.extensions = ["apkg"]' cws/unpacked/manifest.json`" > cws/unpacked/manifest.json - -# Prepare release package -cd cws/unpacked -zip -q -r -o ../../cws/release.zip * diff --git a/tools/localization/src/constants.ts b/tools/localization/src/constants.ts index cb792a296d..dfeeb56740 100644 --- a/tools/localization/src/constants.ts +++ b/tools/localization/src/constants.ts @@ -32,7 +32,6 @@ createDirIfNotExisting(TEMP_DIR); export const I18N_FILES_DIR = path.join(__dirname, RES_DIR, "values/"); export const RES_VALUES_LANG_DIR = path.join(__dirname, RES_DIR, "values-"); -export const TITLE_FILE = path.join(__dirname, DOCS_MARKET_DIR, "ankidroid-titles.txt"); export const MARKET_DESC_FILE = path.join( __dirname, DOCS_MARKET_DIR, diff --git a/tools/localization/src/update.ts b/tools/localization/src/update.ts index 11ee96383b..cd1b42687f 100644 --- a/tools/localization/src/update.ts +++ b/tools/localization/src/update.ts @@ -20,7 +20,6 @@ import { LOCALIZED_REGIONS, TEMP_DIR, TITLE_STR, - TITLE_FILE, I18N_FILES, XML_LICENSE_HEADER, RES_VALUES_LANG_DIR, @@ -142,16 +141,6 @@ async function update( return true; } - // these are appended to a special file - if (f == "15-markettitle") { - const translatedTitle = translatedContent.split("\n")[0]; - - if (TITLE_STR != translatedTitle) { - fs.appendFileSync(TITLE_FILE, "\n" + language + ": " + translatedTitle); - } - return true; - } - // Everything else is a regular file to translate into Android resources const newfile = valuesDirectory + f + ".xml"; fs.writeFileSync(newfile, translatedContent); @@ -162,10 +151,6 @@ async function update( * Update translated I18n files in res/value dir */ export async function updateI18nFiles() { - // Create new / empty marketing title file to populate - fs.truncateSync(TITLE_FILE); - fs.appendFileSync(TITLE_FILE, TITLE_STR); - for (const language of LANGUAGES) { // Language tags are 2- or 3-letters, and regional files need a marker in Android where subtag starts with "r" // Note the documentation does not describe what works in practice: