diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c39c8e9944954f2cede5c61ad25c55adf1e5f6ba..51be490158c58a0e33fa0d5c2f26a16ef1ee685c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +variables: + APP_NAME: 'murena-dashboard' include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main diff --git a/README.md b/README.md index c375d0d28ddcb1bfdb86b095159a6fd224d1d077..ac933512b56d0476a479d3f76fa5944c4e8a437f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -## Make ecloud-dashboard app as default dashboard +## Make murena-dashboard app as default dashboard -- To make default dashboard, add `'defaultapp' => 'ecloud-dashboard'` changes in `/config/config.php`. +- To make default dashboard, add `'defaultapp' => 'murena-dashboard'` changes in `/config/config.php`. ## Config options diff --git a/appinfo/info.xml b/appinfo/info.xml index f948d7d64bed5ec0a419405ff7bb4b7f9eebf43c..4bea43e3161d1555a3175009fa11db935fefeceb 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,23 +1,23 @@ - ecloud-dashboard - Murena dashboard - Murena Cloud Dashboard - - 1.4.1 + murena-dashboard + Murena Dashboard + Murena Dashboard + + 1.5.0 agpl Murena - EcloudDashboard + MurenaDashboard dashboard - https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-dashboard/-/issues + https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/murena-dashboard/-/issues - + Murena Dashboard - ecloud-dashboard.page.index + murena-dashboard.page.index diff --git a/l10n/de.js b/l10n/de.js index 7ef54b0fab423a33052100ac3db8b50f6fa1319f..e9cff093a96e147f03c33006831d65c2557b5345 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -1,13 +1,11 @@ OC.L10N.register( - "ecloud-dashboard", + "murena-dashboard", { "Error when trying to connect to ONLYOFFICE" : "Fehler beim Verbinden mit ONLYOFFICE", "Document" : "Dokument", "Spreadsheet" : "Tabelle", "Presentation" : "Präsentation", - "Murena dashboard" : "Murena Übersichtsseite", "Murena Dashboard" : "Murena Übersichtsseite", - "Murena Cloud Dashboard" : "Murena Cloud Übersichtsseite", "Welcome back" : "Willkommen zurück", "Show All Apps" : "Alle Apps anzeigen", "Show Less Apps" : "Weniger Apps anzeigen", diff --git a/l10n/de.json b/l10n/de.json index c8de77fd71dc31a1542c470a60f383793951c3a8..438938898c5ac4f69cfc7711f4a4131a19ca0e88 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -3,9 +3,7 @@ "Document" : "Dokument", "Spreadsheet" : "Tabelle", "Presentation" : "Präsentation", - "Murena dashboard" : "Murena Übersichtsseite", "Murena Dashboard" : "Murena Übersichtsseite", - "Murena Cloud Dashboard" : "Murena Cloud Übersichtsseite", "Welcome back" : "Willkommen zurück", "Show All Apps" : "Alle Apps anzeigen", "Show Less Apps" : "Weniger Apps anzeigen", diff --git a/l10n/en.js b/l10n/en.js index 70ee58e3adb91daa8f7a6a719596d34823c35331..aaf69e624d69ac0eebabf30f8c05b750c37c0ef8 100755 --- a/l10n/en.js +++ b/l10n/en.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "murena-dashboard", { "Error when trying to connect to ONLYOFFICE" : "Error when trying to connect to ONLYOFFICE", "Document" : "Document", @@ -9,7 +9,8 @@ OC.L10N.register( "Storage" : "Storage", "Upgrade Storage" : "Upgrade Storage", "getCredits" : "Get up to 40€ of credits for your cloud storage by inviting your friends!", - "openAnAccount" : "For every friend who opens an account, you will earn 2€ to be used for cloud storage on ecloud.", - "Invite Your Friends" : "Invite Your Friends" + "openAnAccount" : "For every friend who opens an account, you will earn 2€ to be used for cloud storage on Murena cloud.", + "Invite Your Friends" : "Invite Your Friends", + "Murena Dashboard" : "Murena Dashboard" }, "nplurals=2; plural=n != 1;"); diff --git a/l10n/en.json b/l10n/en.json index cd638ac603c95ba8f49f084c6173dbf4e70cf0be..a321a17f429041fb8168ad8b1fc330e22b5462f5 100755 --- a/l10n/en.json +++ b/l10n/en.json @@ -7,7 +7,8 @@ "Storage" : "Storage", "Upgrade Storage" : "Upgrade Storage", "getCredits" : "Get up to 40€ of credits for your cloud storage by inviting your friends!", - "openAnAccount" : "For every friend who opens an account, you will earn 2€ to be used for cloud storage on ecloud.", - "Invite Your Friends" : "Invite Your Friends" + "openAnAccount" : "For every friend who opens an account, you will earn 2€ to be used for cloud storage on Murena cloud.", + "Invite Your Friends" : "Invite Your Friends", + "Murena Dashboard" : "Murena Dashboard" },"pluralForm" :"nplurals=2; plural=n != 1;" } \ No newline at end of file diff --git a/l10n/es.js b/l10n/es.js index 4e5b98c8e75be18464ca054a29611ac88b61b8ad..64e633797fabae361be0c4b3d759e2b57fbaef37 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "murena-dashboard", { "Welcome back" : "Bienvenido de nuevo", "Show All Apps" : "Mostrar todas las aplicaciones", @@ -7,7 +7,8 @@ OC.L10N.register( "Storage" : "Almacenamiento", "Upgrade Storage" : "Actualizar almacenamiento", "getCredits" : "¡Obtenga hasta 40€ de créditos para su almacenamiento en la nube invitando a sus amigos!", - "openAnAccount" : "Por cada amigo que abra una cuenta, ambos ganarán 2 € que se utilizarán para el almacenamiento en la nube en ecloud.", - "Invite Your Friends" : "Invita a tus amigos" + "openAnAccount" : "Por cada amigo que abra una cuenta, ambos ganarán 2 € que se utilizarán para el almacenamiento en la nube en Murena cloud.", + "Invite Your Friends" : "Invita a tus amigos", + "Murena Dashboard" : "Cuadro de mando de Murena" }, ""); diff --git a/l10n/es.json b/l10n/es.json index 928c3921940d6708a202137a00fee483ed106ff7..405d4ff12886fbfc56d94573429620fbb2f8dcc4 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -5,7 +5,8 @@ "Storage" : "Almacenamiento", "Upgrade Storage" : "Actualizar almacenamiento", "getCredits" : "¡Obtenga hasta 40€ de créditos para su almacenamiento en la nube invitando a sus amigos!", - "openAnAccount" : "Por cada amigo que abra una cuenta, ambos ganarán 2 € que se utilizarán para el almacenamiento en la nube en ecloud.", - "Invite Your Friends" : "Invita a tus amigos" + "openAnAccount" : "Por cada amigo que abra una cuenta, ambos ganarán 2 € que se utilizarán para el almacenamiento en la nube en Murena cloud.", + "Invite Your Friends" : "Invita a tus amigos", + "Murena Dashboard" : "Cuadro de mando de Murena" },"pluralForm" :"" } \ No newline at end of file diff --git a/l10n/fr.js b/l10n/fr.js index f0690be19172779e3fadb32e41914319f1aea25c..0e0b6e51318166e338e50c7a04769ecc1dce9fa9 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "murena-dashboard", { "Error when trying to connect to ONLYOFFICE" : "Erreur lors d'une tentative de connexion à ONLYOFFICE", "Document" : "Document", @@ -14,7 +14,8 @@ OC.L10N.register( "Storage" : "Espace de stockage", "Upgrade Storage" : "Obtenez plus de stockag", "getCredits" : "Obtenez jusqu'à 40€ de crédits pour votre stockage cloud en invitant vos amis !", - "openAnAccount" : "Pour chaque ami qui ouvre un compte, vous gagnerez tous les deux 2€ à utiliser pour le stockage cloud sur ecloud.", - "Invite Your Friends" : "Parrainez vos amis" + "openAnAccount" : "Pour chaque ami qui ouvre un compte, vous gagnerez tous les deux 2€ à utiliser pour le stockage cloud sur Murena cloud.", + "Invite Your Friends" : "Parrainez vos amis", + "Murena Dashboard" : "Tableau de bord Murena" }, "nplurals=2; plural=n > 1;"); diff --git a/l10n/fr.json b/l10n/fr.json index a4e092d1d1162fa56fd735b6db8d4b4d76f5947e..678f17c19170ff6987aaca4d6ec9d08889425740 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -12,7 +12,8 @@ "Storage" : "Espace de stockage", "Upgrade Storage" : "Obtenez plus de stockag", "getCredits" : "Obtenez jusqu'à 40€ de crédits pour votre stockage cloud en invitant vos amis !", - "openAnAccount" : "Pour chaque ami qui ouvre un compte, vous gagnerez tous les deux 2€ à utiliser pour le stockage cloud sur ecloud.", - "Invite Your Friends" : "Parrainez vos amis" + "openAnAccount" : "Pour chaque ami qui ouvre un compte, vous gagnerez tous les deux 2€ à utiliser pour le stockage cloud sur Murena cloud.", + "Invite Your Friends" : "Parrainez vos amis", + "Murena Dashboard" : "Tableau de bord Murena" },"pluralForm" :"nplurals=2; plural=n > 1;" } \ No newline at end of file diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index ce2a5a42b3a6f71ff2e4254db2bd666ea9f9d773..9881c6883af9b6d89c4a1dfa9e2d7c8e2b10faf3 100755 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -1,12 +1,12 @@ initialState->provideInitialState('increaseStorageUrl', $storageUrl); $this->initialState->provideInitialState('entries', $entries); $this->initialState->provideInitialState('displayName', $displayName); - return new TemplateResponse('ecloud-dashboard', 'dashboard'); + return new TemplateResponse($this->appName, 'dashboard'); } } diff --git a/lib/Util.php b/lib/Util.php index 8fb2cb51c3989f884b4442794877f5c26158e2fa..2cf484ed9020626cc510a9f07816b6c124ae5afe 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -1,6 +1,6 @@