diff --git a/src/api/CompileTools.ts b/src/api/CompileTools.ts index bc96fae60..3c3760190 100644 --- a/src/api/CompileTools.ts +++ b/src/api/CompileTools.ts @@ -71,6 +71,7 @@ export namespace CompileTools { variables[`&HOST`] = connection.currentHost; variables[`{host}`] = connection.currentHost; variables[`&HOME`] = config.homeDirectory; + variables[`&WORKDIR`] = config.homeDirectory; for (const variable of config.customVariables) { variables[`&${variable.name.toUpperCase()}`] = variable.value; @@ -237,6 +238,7 @@ export namespace CompileTools { variables[`&FULLPATH`] = fullPath; variables[`{path}`] = fullPath; variables[`&WORKDIR`] = remoteCwd; + variables[`&FILEDIR`] = path.posix.parse(fullPath).dir; const branch = getGitBranch(fromWorkspace); if (branch) { @@ -253,6 +255,7 @@ export namespace CompileTools { const fullName = uri.path; variables[`&FULLPATH`] = fullName; + variables[`&FILEDIR`] = path.parse(fullName).dir; break; } diff --git a/src/locale/ids/da.ts b/src/locale/ids/da.ts index d8f9b915c..9fa39ed76 100644 --- a/src/locale/ids/da.ts +++ b/src/locale/ids/da.ts @@ -219,7 +219,7 @@ export const da: Locale = { //Actions 'actions.CURLIB': 'Aktuelle bibliotek (sættes i Library List)', 'actions.USERNAME': `Brugernavn for forbindelsen`, - 'actions.HOME': `Aktuelle mappe (sættes i IFS Browser)`, + 'actions.WORKDIR': `Aktuel arbejdsmappe, kan ændres i IFS Browser`, 'actions.HOST': `Host navn eller IP adresse fra den aktuelle forbindelse`, 'actions.BUILDLIB': `Det samme som &CURLIB`, 'actions.LIBLC': `Liste af biblioteker adskilt af komma`, @@ -229,7 +229,8 @@ export const da: Locale = { 'actions.OPENMBR': `Navn på source member (&OPENMBRL for små bogstaver)`, 'actions.member.EXT': `Type af source member (&EXTL for små bogstaver)`, 'actions.FULLPATH': `Fulde sti på filen på fjernsystemet`, - 'actions.RELATIVEPATH': `Relative sti for filen fra aktuelle mappe eller workspace`, + 'actions.FILEDIR': `Katalog over filen på fjernsystemet`, + 'actions.RELATIVEPATH': `Relativ sti til streamfilen fra arbejdsbiblioteket eller arbejdsområdet`, 'actions.PARENT': `Navn på forrige mappe eller source fil`, 'actions.BASENAME': `Navn på filen, inklusive filtypen`, 'actions.streamfile.NAME': `Navn på filen (&NAMEL for små bogstaver)`, diff --git a/src/locale/ids/en.ts b/src/locale/ids/en.ts index bcec0290b..12d515665 100644 --- a/src/locale/ids/en.ts +++ b/src/locale/ids/en.ts @@ -219,7 +219,7 @@ export const en: Locale = { //Actions 'actions.CURLIB': 'Current library, changeable in Library List', 'actions.USERNAME': `Username for connection`, - 'actions.HOME': `Current home/working directory, changable in IFS Browser`, + 'actions.WORKDIR': `Current working directory, changeable in IFS Browser`, 'actions.HOST': `Hostname or IP address from the current connection`, 'actions.BUILDLIB': `The same as &CURLIB`, 'actions.LIBLC': `Library list delimited by comma`, @@ -229,7 +229,8 @@ export const en: Locale = { 'actions.OPENMBR': `Name of the source member (&OPENMBRL for lowercase)`, 'actions.member.EXT': `Extension of the source member (&EXTL for lowercase)`, 'actions.FULLPATH': `Full path of the file on the remote system`, - 'actions.RELATIVEPATH': `Relative path of the streamfile from the home directory or workspace`, + 'actions.FILEDIR': `Directory of the file on the remote system`, + 'actions.RELATIVEPATH': `Relative path of the streamfile from the working directory or workspace`, 'actions.PARENT': `Name of the parent directory or source file`, 'actions.BASENAME': `Name of the file, including the extension`, 'actions.streamfile.NAME': `Name of the file (&NAMEL for lowercase)`, diff --git a/src/locale/ids/fr.ts b/src/locale/ids/fr.ts index 0410b3cd2..e3d6597c2 100644 --- a/src/locale/ids/fr.ts +++ b/src/locale/ids/fr.ts @@ -219,7 +219,7 @@ export const fr: Locale = { //Actions 'actions.CURLIB': 'Bibliothèque en cours, modifiable depuis la Liste des Bibliothèques', 'actions.USERNAME': `Nom d'utilisateur de la connexion`, - 'actions.HOME': `Home/répertoire de travail en cours, modifiable depuis l'Exporateur IFS`, + 'actions.WORKDIR': `Répertoire de travail actuel, modifiable dans le navigateur IFS`, 'actions.HOST': `Nom d'hôte ou adresse IP de la connexion`, 'actions.BUILDLIB': `Voir &CURLIB`, 'actions.LIBLC': `Liste des bilbiothèques, séparée par des virgules`, @@ -229,7 +229,8 @@ export const fr: Locale = { 'actions.OPENMBR': `Nom du membre source (&OPENMBRL pour le nom en minuscule)`, 'actions.member.EXT': `Extension du membre source (&EXTL pour le nom en minuscule)`, 'actions.FULLPATH': `Chemin absolu du fichier sur le système distant`, - 'actions.RELATIVEPATH': `Chemin relatif du fichier depuis le répertoire home ou de travail`, + 'actions.FILEDIR': `Répertoire du fichier sur le système distant`, + 'actions.RELATIVEPATH': `Chemin relatif du fichier de flux à partir du répertoire de travail ou de l'espace de travail`, 'actions.PARENT': `Nom du répertoire parent du fichier`, 'actions.BASENAME': `Nom du fichier avec son extension`, 'actions.streamfile.NAME': `Nom du fichier (&NAMEL pour le nom en minuscule)`, diff --git a/src/webviews/actions/varinfo.ts b/src/webviews/actions/varinfo.ts index caaaeb62c..6f3379efd 100644 --- a/src/webviews/actions/varinfo.ts +++ b/src/webviews/actions/varinfo.ts @@ -15,7 +15,7 @@ type VariableInfoList = { const generic: () => VariableInfo[] = () => [ { name: `&CURLIB`, text: t(`actions.CURLIB`) }, { name: `&USERNAME`, text: t("actions.USERNAME")}, - { name: `&HOME`, text: t("actions.HOME")}, + { name: `&WORKDIR`, text: t("actions.WORKDIR")}, { name: `&HOST`, text: t("actions.HOST")}, { name: `&BUILDLIB`, text: t("actions.BUILDLIB")}, { name: `&LIBLC`, text: t("actions.LIBLC")}, @@ -33,6 +33,7 @@ export function getVariablesInfo(): VariableInfoList { ], streamFile: [ { name: `&FULLPATH`, text: t("actions.FULLPATH")}, + { name: `&FILEDIR`, text: t("actions.FILEDIR")}, { name: `&RELATIVEPATH`, text: t("actions.RELATIVEPATH")}, { name: `&PARENT`, text: t("actions.PARENT")}, { name: `&BASENAME`, text: t("actions.BASENAME")},