UpsilonNumworks · Yaya-Cout · Oct 24, 2022 · Oct 24, 2022 · Oct 24, 2022 · Oct 24, 2022
diff --git a/Makefile b/Makefile
@@ -31,13 +31,7 @@ ifeq ($(filter reader,$(apps_list)),)
   HAS_READER := 1
 endif
 
-# Remove the external apps for the n0100
-ifeq (${MODEL}, n0100)
-    apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
-else
-    apps_list = ${EPSILON_APPS}
-endif
-
+apps_list = ${EPSILON_APPS}
 ifdef FORCE_EXTERNAL
   apps_list = ${EPSILON_APPS}
 endif

diff --git a/apps/external/Makefile b/apps/external/Makefile
@@ -1,53 +1,16 @@
-ifdef HOME_DISPLAY_EXTERNALS
-
-app_external_src = $(addprefix apps/external/,\
-	extapp_api.cpp \
-	archive.cpp \
-)
-
 $(eval $(call depends_on_image,apps/home/controller.cpp,apps/external/external_icon.png))
 
-else
-
-apps += External::App
-app_headers += apps/external/app.h
-
-app_external_src = $(addprefix apps/external/,\
-	app.cpp \
-	extapp_api.cpp \
-	archive.cpp \
-	main_controller.cpp \
-	pointer_text_table_cell.cpp \
-)
-
-$(eval $(call depends_on_image,apps/external/app.cpp,apps/external/external_icon.png))
-
-endif
-
 SFLAGS += -Iapps/external/
 
 EXTAPP_PATH ?= apps/external/app/
+
 ifeq ($(PLATFORM),device)
+# FIXME: Should be handled by Ion, since external apps are managed by Ion
 	SFLAGS += -DDEVICE
 else
 	include $(EXTAPP_PATH)/sources.mak
 endif
 
-ifdef EXTERNAL_BUILTIN
-SFLAGS += -DEXTERNAL_BUILTIN
-endif
-
 apps_src += $(app_external_src)
 
-i18n_files += $(addprefix apps/external/,\
-  base.de.i18n\
-  base.en.i18n\
-  base.es.i18n\
-  base.fr.i18n\
-  base.pt.i18n\
-  base.it.i18n\
-  base.nl.i18n\
-  base.hu.i18n\
-  base.universal.i18n\
-)
-
+i18n_files += $(call i18n_without_universal_for,external/base)
diff --git a/apps/external/app.cpp b/apps/external/app.cpp
diff --git a/apps/external/app.h b/apps/external/app.h
diff --git a/apps/external/app/sources.mak b/apps/external/app/sources.mak
@@ -1,3 +1,3 @@
-app_external_src += $(addprefix apps/external/app/,\
+app_external_src += $(addprefix $(EXTAPP_PATH),\
 	sample.c \
-)
+)
diff --git a/apps/external/base.de.i18n b/apps/external/base.de.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "API stimmt nicht überein"
 ExternalAppExecError = "Datei kann nicht ausgeführt werden"
-ExternalNotCompatible = "Externe App ist nicht kompatibel"
-WithSimulator = "mit dem Simulator"
-WithN0100 = "mit N0100"
-GetMoreAppsAt = "Weitere Apps abrufen bei"
-NoAppsInstalled = "Keine Apps installiert"
diff --git a/apps/external/base.en.i18n b/apps/external/base.en.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "API mismatch"
 ExternalAppExecError = "Cannot execute file"
-ExternalNotCompatible = "External is not compatible"
-WithSimulator = "with the simulator"
-WithN0100 = "with n0100"
-GetMoreAppsAt = "Get more apps at"
-NoAppsInstalled = "No apps installed"
diff --git a/apps/external/base.es.i18n b/apps/external/base.es.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "Discordancia de API"
 ExternalAppExecError = "No se puede ejecutar el archivo"
-ExternalNotCompatible = "Externo no es compatible"
-WithSimulator = "con el simulador"
-WithN0100 = "con n0100"
-GetMoreAppsAt = "Obtenga más aplicaciones en"
-NoAppsInstalled = "No hay aplicaciones instaladas"
diff --git a/apps/external/base.fr.i18n b/apps/external/base.fr.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "Décalage API"
 ExternalAppExecError = "Le fichier ne peut pas être exécuté"
-ExternalNotCompatible = "External n'est pas compatible"
-WithSimulator = "avec le simulateur"
-WithN0100 = "avec n0100"
-GetMoreAppsAt = "Télécharge d'autres apps sur"
-NoAppsInstalled = "Aucune applications installées"
diff --git a/apps/external/base.hu.i18n b/apps/external/base.hu.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "Külsö"
-ExternalAppCapital = "KÜLSÖ"
-ExternalAppApiMismatch = "API eltérés"
-ExternalAppExecError = "A fájl nem futtatható"
-ExternalNotCompatible = "Externál nem kompatibilis"
-WithSimulator = "Szimulátorral"
-WithN0100 = "n0100-al"
-GetMoreAppsAt = "Mégtöbb alkalmazás itt :"
-NoAppsInstalled = "Nincs letöltött externál"
+ExternalAppApiMismatch = "API eltérés"
+ExternalAppExecError = "A fájl nem futtatható"
diff --git a/apps/external/base.it.i18n b/apps/external/base.it.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "API mismatch"
 ExternalAppExecError = "Cannot execute file"
-ExternalNotCompatible = "External is not compatible"
-WithSimulator = "with the simulator"
-WithN0100 = "with n0100"
-GetMoreAppsAt = "Get more apps at"
-NoAppsInstalled = "No apps installed"
diff --git a/apps/external/base.nl.i18n b/apps/external/base.nl.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "API mismatch"
 ExternalAppExecError = "Cannot execute file"
-ExternalNotCompatible = "External is not compatible"
-WithSimulator = "with the simulator"
-WithN0100 = "with n0100"
-GetMoreAppsAt = "Get more apps at"
-NoAppsInstalled = "No apps installed"
diff --git a/apps/external/base.pt.i18n b/apps/external/base.pt.i18n
@@ -1,9 +1,2 @@
-ExternalApp = "External"
-ExternalAppCapital = "EXTERNAL"
 ExternalAppApiMismatch = "API mismatch"
 ExternalAppExecError = "Cannot execute file"
-ExternalNotCompatible = "Externo no es compatiblee"
-WithSimulator = "con el simulador"
-WithN0100 = "con n0100"
-GetMoreAppsAt = "Obtenga más aplicaciones en"
-NoAppsInstalled = "No hay aplicaciones instaladas"
diff --git a/apps/external/base.universal.i18n b/apps/external/base.universal.i18n
@@ -1 +0,0 @@
-URL = "zardam.github.io/nw-external-apps/"