Revert "Wire frontend for appstream translations"

This reverts commit 2036e06.

backend/app/app.py

@@ -139,10 +139,7 @@ def get_appstream(
         pattern=r"^[A-Za-z_][\w\-\.]+$",
         examples=["org.gnome.Glade"],
     ),
-    locale: str = "en",
 ):
-    ## TODO: Use locale to return the correct language - but fallback to english if not available
-
     if value := db.get_json_key(f"apps:{app_id}"):
         return value
 

backend/tests/main.py

@@ -120,19 +120,13 @@ def test_apps_by_non_existent_developer(client):
 
 
 def test_appstream_by_appid(client, snapshot):
-    response = client.get("/appstream/org.sugarlabs.Maze?locale=en")
-    assert response.status_code == 200
-    assert snapshot("test_appstream_by_appid_en.json") == response.json()
-
-
-def test_appstream_by_appid_fallback(client, snapshot):
     response = client.get("/appstream/org.sugarlabs.Maze")
     assert response.status_code == 200
     assert snapshot("test_appstream_by_appid.json") == response.json()
 
 
 def test_appstream_by_non_existent_appid(client):
-    response = client.get("/appstream/NonExistent?locale=en")
+    response = client.get("/appstream/NonExistent")
     assert response.status_code == 404
     assert response.json() is None
 

frontend/pages/apps/[appDetails].tsx

@@ -139,7 +139,7 @@ export const getStaticProps: GetStaticProps = async ({
   }
 
   let eolMessage: string = null
-  const app = await (await fetchAppstream(appId as string, locale)).data
+  const app = await (await fetchAppstream(appId as string)).data
 
   if (!app) {
     eolMessage = (await getEolMessageAppidEolMessageAppIdGet(appId as string))

frontend/pages/apps/manage/[appId]/accept-invite/index.tsx

@@ -128,7 +128,7 @@ export const getStaticProps: GetStaticProps = async ({
   locale,
   params: { appId },
 }) => {
-  const app = (await fetchAppstream(appId as string, locale))?.data
+  const app = (await fetchAppstream(appId as string))?.data
 
   return {
     props: {

frontend/pages/apps/manage/[appId]/index.tsx

@@ -178,7 +178,7 @@ export const getStaticProps: GetStaticProps = async ({
   axios.defaults.baseURL = process.env.NEXT_PUBLIC_API_BASE_URI
 
   const [{ data: app }, { data: vendingConfig }] = await Promise.all([
-    fetchAppstream(appId as string, locale),
+    fetchAppstream(appId as string),
     getGlobalVendingConfigVendingConfigGet(),
   ])
 

frontend/pages/apps/purchase/[appId].tsx

@@ -37,7 +37,7 @@ export const getStaticProps: GetStaticProps = async ({
   axios.defaults.baseURL = process.env.NEXT_PUBLIC_API_BASE_URI
 
   const [{ data: app }, { data: vendingConfig }] = await Promise.all([
-    fetchAppstream(appId as string, locale),
+    fetchAppstream(appId as string),
     getGlobalVendingConfigVendingConfigGet(),
   ])
 

frontend/src/asyncs/app.ts

@@ -6,23 +6,18 @@ import { Appstream } from "../types/Appstream"
  * Fetches the appstream data for a set of apps (e.g. the user's).
  * @param appIds array of app identifiers to fetch data for
  */
-export async function getAppsInfo(
-  appIds: string[],
-  locale: string,
-): Promise<Appstream[]> {
+export async function getAppsInfo(appIds: string[]): Promise<Appstream[]> {
   const responses = await Promise.allSettled(
     appIds.map(async (id) => ({
       id,
-      response: await axios
-        .get<Appstream>(`${APP_DETAILS(id, locale)}`)
-        .catch(() => {
-          return {
-            data: {
-              id: id,
-              name: id,
-            } as Appstream,
-          } as AxiosResponse<Appstream>
-        }),
+      response: await axios.get<Appstream>(`${APP_DETAILS(id)}`).catch(() => {
+        return {
+          data: {
+            id: id,
+            name: id,
+          } as Appstream,
+        } as AxiosResponse<Appstream>
+      }),
     })),
   )
 

frontend/src/components/moderation/AppModeration.tsx

@@ -31,7 +31,7 @@ const AppModeration: FunctionComponent<Props> = ({ appId }) => {
 
   const appInfoQuery = useQuery({
     queryKey: ["app", appId],
-    queryFn: () => getAppsInfo([appId], "en"),
+    queryFn: () => getAppsInfo([appId]),
     enabled: !!appId,
   })
 

frontend/src/components/moderation/ModerationTabs.tsx

@@ -63,10 +63,7 @@ const ModerationTabs: FunctionComponent = () => {
 
       return {
         apps: apps.data,
-        appstream: await getAppsInfo(
-          apps.data.apps.map((app) => app.appid),
-          "en",
-        ),
+        appstream: await getAppsInfo(apps.data.apps.map((app) => app.appid)),
       }
     },
   })

frontend/src/components/user/UserApps.tsx

@@ -11,14 +11,9 @@ import { doRefreshDevFlatpaksAuthRefreshDevFlatpaksPost } from "src/codegen"
 interface Props {
   variant: "dev" | "owned" | "invited"
   customButtons?: JSX.Element
-  locale: string
 }
 
-const UserApps: FunctionComponent<Props> = ({
-  variant,
-  customButtons,
-  locale,
-}) => {
+const UserApps: FunctionComponent<Props> = ({ variant, customButtons }) => {
   const { t } = useTranslation()
   const user = useUserContext()
   const userDispatch = useUserDispatch()
@@ -28,14 +23,13 @@ const UserApps: FunctionComponent<Props> = ({
   const [page, setPage] = useState(1)
 
   const queryDevApplications = useQuery({
-    queryKey: [`${variant}-apps`, page, pageSize, locale],
+    queryKey: [`${variant}-apps`, page, pageSize],
     queryFn: async () => {
       return getAppsInfo(
         user.info[`${variant}_flatpaks`].slice(
           (page - 1) * pageSize,
           (page - 1) * pageSize + pageSize,
         ),
-        locale,
       )
     },
     enabled: !!user.info,

frontend/src/env.ts

@@ -3,8 +3,7 @@ import { Category } from "./types/Category"
 const BASE_URI: string = process.env.NEXT_PUBLIC_API_BASE_URI
 
 export const APPSTREAM_URL: string = `${BASE_URI}/appstream`
-export const APP_DETAILS = (id: string, locale: string): string =>
-  `${APPSTREAM_URL}/${id}?locale=${locale}`
+export const APP_DETAILS = (id: string): string => `${APPSTREAM_URL}/${id}`
 export const SUMMARY_DETAILS = (id: string): string =>
   `${BASE_URI}/summary/${id}`
 export const STATS_DETAILS = (id: string): string => `${BASE_URI}/stats/${id}`

frontend/src/fetchers.ts

@@ -30,14 +30,12 @@ export async function fetchAppstreamList() {
   return axios.get<string[]>(APPSTREAM_URL)
 }
 
-export async function fetchAppstream(appId: string, locale: string) {
-  return axios
-    .get<Appstream>(`${APP_DETAILS(appId, locale)}`)
-    .catch((error) => {
-      return {
-        data: null,
-      }
-    })
+export async function fetchAppstream(appId: string) {
+  return axios.get<Appstream>(`${APP_DETAILS(appId)}`).catch((error) => {
+    return {
+      data: null,
+    }
+  })
 }
 
 export async function fetchSummary(appId: string) {