diff --git a/app/config/locale/en.php b/app/config/locale/en.php index 6500cf225..6cca5b0f4 100644 --- a/app/config/locale/en.php +++ b/app/config/locale/en.php @@ -6,240 +6,7 @@ return [ 'settings.direction' => 'ltr', // General - 'general.description' => 'Appwrite cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you grow your business in a fast and secure way.', 'general.loading' => 'Loading...', - 'general.next' => 'Next', - 'general.back' => 'Back', - 'general.optional' => 'optional', - 'general.learn-more-about' => 'Learn more about your', - 'general.confirm.alert' => 'Please confirm your account by clicking the verification link sent to your email', - 'general.confirm.resend' => 'send again', - 'general.confirm.resend.success' => 'Confirmation mail sent successfully', - 'general.confirm.resend.failure' => 'Confirmation mail failed to send. Please try again later', - - 'general.roles.owner' => 'Owner', - 'general.roles.developer' => 'Developer', - 'general.roles.admin' => 'Admin', - - 'general.alerts.cookie' => 'We are using cookies to make this website easier to use.', - 'general.alerts.learn' => 'Learn More', - - 'navigation.home' => 'Home', - 'navigation.features' => 'Features', - 'navigation.pricing' => 'Pricing', - 'navigation.signup' => 'Sign Up', - 'navigation.signin' => 'Sign In', - 'navigation.console' => 'Console', - - 'footer.blog' => 'Blog', - 'footer.about' => 'About', - 'footer.security' => 'Security', - 'footer.status' => 'Status', - 'footer.support' => 'Support', - 'footer.contact' => 'Contact', - 'footer.twitter' => 'on Twitter', - 'footer.facebook' => 'on Facebook', - 'footer.instagram' => 'on Instagram', - 'footer.linkedin' => 'on LinkedIn', - 'footer.copyright' => 'Copyright', - 'footer.terms' => 'Terms', - 'footer.privacy' => 'Privacy', - 'footer.cookies' => 'Cookies', - - 'home.press.title' => 'Press Kit', - 'home.press.subtitle' => 'For media inquires and more information, email us at team@appwrite.io', - 'home.press.title.logos' => 'Logos', - 'home.press.title.colors' => 'Brand Colors', - 'home.press.title.photos' => 'Product Photos', - - 'home.cookies.title' => 'Cookies', - 'home.cookies.paragraph-1' => 'When someone visits '.APP_NAME.', we collect standard internet log information and details of visitor behaviour patterns. We do this to find out things such as the number of visitors to the various parts of the site. We collect this information in a way which does not personally identify anyone.', - 'home.cookies.paragraph-2' => 'Most web browsers allow some control of most cookies through the browser settings. To find out more about cookies, including how to see what cookies have been set and how to manage and delete them, visit', - 'home.cookies.set' => 'Cookies set by '.APP_NAME, - 'home.cookies.cell.name' => 'Name', - 'home.cookies.cell.description' => 'Description', - 'home.cookies.cell.duration' => 'Duration', - 'home.cookies.more' => 'Read More', - 'home.cookies.months' => 'months', - 'home.cookies.days' => 'days', - 'home.cookies.hours' => 'hours', - 'home.cookies.minutes' => 'minutes', - 'home.cookies.description1' => 'Keeps your website session alive.', - 'home.cookies.description2' => 'Google Analytics cookie, used to distinguish users.', - 'home.cookies.description3' => 'Google Analytics cookie, used to distinguish users.', - 'home.cookies.description4' => 'Google Analytics cookie, Used to throttle request rate.', - 'home.cookies.description5' => 'Google Analytics cookie, Contains campaign related information for the user.', - 'home.cookies.description6' => 'Google cookie, Contains information that changes the way the site behaves or looks, such as your preferred language or the region you are in.', - 'home.cookies.description7' => 'System user interface preferred language.', - - 'home.contact.title' => 'Contact Us', - 'home.contact.subtitle' => 'We’d love your input: questions, feature requests, bugs or compliments', - 'home.contact.form.name' => 'Name', - 'home.contact.form.email' => 'Email', - 'home.contact.form.subject' => 'Subject', - 'home.contact.form.message' => 'Message', - 'home.contact.form.submit' => 'Submit', - 'home.contact.form.social' => 'Social Networks', - 'home.contact.form.company' => 'Company Name', - 'home.contact.form.size' => 'Company Size', - 'home.contact.thanks.title' => 'Thank You!', - 'home.contact.thanks.subtitle' => 'Your message has been sent successfully. We appreciate your feedback, our team will try to get back to you as soon as possible!', - 'home.contact.thanks.back' => 'Back to Homepage', - - 'home.support.title' => 'Support', - 'home.support.healthy' => 'Service is healthy.', - 'home.support.unhealthy' => 'We are experiencing some service disruption.', - 'home.support.view' => 'View Status', - 'home.support.uptime' => 'uptime in last 24h', - 'home.support.updated' => 'Last updated at', - 'home.support.powered' => 'Powered by', - - // Auth - Signin - 'home.auth.signin.title' => 'Sign In', - 'home.auth.signin.regular.title' => 'Login using email and password', - 'home.auth.signin.oauth.title' => 'Login using your favorite OAuth provider', - 'home.auth.signin.oauth.facebook' => 'Sign in with Facebook', - 'home.auth.signin.oauth.linkedin' => 'Sign in with LinkedIn', - 'home.auth.signin.oauth.github' => 'Sign in with GitHub', - 'home.auth.signin.labels.email' => 'Email', - 'home.auth.signin.labels.password' => 'Password', - 'home.auth.signin.labels.password.validation' => 'Six or more characters', - 'home.auth.signin.labels.action1' => 'Sign In', - 'home.auth.signin.labels.action2' => 'Forgot password?', - 'home.auth.signin.labels.action3' => 'Sign up now', - 'home.auth.signin.labels.or' => 'or don\'t have an account?', - 'home.auth.signin.failure' => 'Login failed. Please check your credentials.', - - // Auth - Signup - 'home.auth.signup.title' => 'Sign Up', - 'home.auth.signup.required' => 'All fields are required', - 'home.auth.signup.labels.name' => 'Name', - 'home.auth.signup.labels.email' => 'Email', - 'home.auth.signup.labels.password' => 'Password', - 'home.auth.signup.labels.password.validation' => 'Six or more characters', - 'home.auth.signup.labels.agree' => 'By signing up, you agree to the', - 'home.auth.signup.labels.and' => ' and ', - 'home.auth.signup.labels.terms' => 'Terms and Conditions', - 'home.auth.signup.labels.privacy' => 'Privacy Policy', - 'home.auth.signup.labels.action' => 'Sign Up', - 'home.auth.signup.failure' => 'Registration Failed. Please try again later', - - // Auth - Recovery - 'home.auth.recovery.title' => 'Password Recovery', - 'home.auth.recovery.required' => 'All fields are required', - 'home.auth.recovery.labels.email' => 'Email', - 'home.auth.recovery.action' => 'Recover', - 'home.auth.recovery.back' => 'Back to sign in', - 'home.auth.recovery.success' => 'We have sent you a mail with a password reset link', - 'home.auth.recovery.failure' => 'Password recovery failed', - - // Auth - Reset - 'home.auth.reset.title' => 'Password Reset', - 'home.auth.reset.required' => 'All fields are required', - 'home.auth.reset.labels.passwordA' => 'Password', - 'home.auth.reset.labels.passwordB' => 'Password Again', - 'home.auth.reset.labels.password.validation' => 'Six or more characters', - 'home.auth.reset.action' => 'Apply', - 'home.auth.reset.success' => 'Password Reset Completed', - 'home.auth.reset.failure' => 'Password Reset Failed', - - // Auth - Confirm - 'home.auth.confirm.title' => 'Account Confirmation in Progress', - 'home.auth.confirm.subtitle' => 'Please wait a few seconds while your account is verified.', - 'home.auth.confirm.success' => 'Confirmation Completed Successfully', - 'home.auth.confirm.failure' => 'Confirmation Failed', - - // Auth - Join - 'home.auth.join.title' => 'Invitation', - 'home.auth.join.subtitle' => 'You have been invited to join %s team on '.APP_NAME, - 'home.auth.join.success' => 'Joined Team Successfully', - 'home.auth.join.failure' => 'Failed to join team. Please try again later', - 'home.auth.join.agree' => 'By accepting the invitation, you agree to the %s and %s.', - 'home.auth.join.terms' => 'Terms and Conditions', - 'home.auth.join.privacy' => 'Privacy Policy', - 'home.auth.join.accept' => 'Accept', - 'home.auth.join.cancel' => 'Cancel', - - 'console.title' => 'Console', - - // Console - Account - 'console.account.title' => 'Account', - 'console.account.section.overview.title' => 'Overview', - 'console.account.section.overview.labels.name' => 'Name', - 'console.account.section.overview.labels.email' => 'Email', - 'console.account.section.overview.labels.password' => 'Password', - 'console.account.section.overview.labels.password1' => 'Current Password', - 'console.account.section.overview.labels.password2' => 'New Password', - 'console.account.section.overview.labels.localization' => 'Localization', - 'console.account.section.overview.labels.language' => 'Language', - 'console.account.section.overview.labels.timezone' => 'Timezone', - 'console.account.section.overview.actions.update-name' => 'Update Name', - 'console.account.section.overview.actions.update-email' => 'Update Email', - 'console.account.section.overview.actions.update-password' => 'Update Password', - 'console.account.section.overview.actions.update-avatar' => 'Upload', - 'console.account.section.overview.actions.update-avatar-via' => 'via', - 'console.account.section.overview.actions.update' => 'Update', - 'console.account.section.overview.actions.cancel' => 'Cancel', - 'console.account.section.overview.actions.logout' => 'Logout', - 'console.account.section.overview.danger.title' => 'Danger Zone', - 'console.account.section.overview.danger.subtitle' => 'This is the area where you can delete your account.', - 'console.account.section.overview.danger.disclaimer' => 'By deleting your account you will lose access to any of your teams and shared data.', - 'console.account.section.overview.danger.note' => 'PLEASE NOTICE: Account deletion is irreversible.', - 'console.account.section.overview.danger.action' => 'Delete Account', - - 'console.account.section.security.title' => 'Security', - 'console.account.section.security.devices.title' => 'Devices and Sessions', - 'console.account.section.security.devices.logout' => 'Logout', - 'console.account.section.security.devices.logout.failure' => 'Logout from Session Failed', - 'console.account.section.security.devices.logout-all' => 'Logout from all devices', - 'console.account.section.security.devices.logout-all.failure' => 'Logout from All Sessions Failed', - 'console.account.section.security.devices.current' => 'Current Session', - 'console.account.section.security.devices.unknown' => 'Unknown Location', - - 'console.account.section.security.recent-activity.title' => 'Recent Activity', - 'console.account.section.security.recent-activity.date' => 'Date', - 'console.account.section.security.recent-activity.event' => 'Event', - 'console.account.section.security.recent-activity.client' => 'Client', - 'console.account.section.security.recent-activity.location' => 'Location', - 'console.account.section.security.recent-activity.ip' => 'IP', - - 'console.notifications.title' => 'Notifications', - - 'console.settings.title' => 'Settings', - 'console.settings.section.overview.title' => 'Overview', - 'console.settings.section.keys.title' => 'API Keys', - 'console.settings.section.webhooks.title' => 'Webhooks', - 'console.settings.section.tasks.title' => 'Tasks', - 'console.settings.section.members.title' => 'Members', - 'console.settings.section.members.labels.leave' => 'Leave', - 'console.settings.section.members.labels.resend' => 'Resend', - 'console.settings.section.members.labels.pending' => 'Pending Approval', - 'console.settings.section.members.labels.invite' => 'Invite Member', - 'console.settings.section.members.labels.send' => 'Send Invite', - 'console.settings.section.members.labels.cancel' => 'Cancel', - 'console.settings.section.members.labels.name' => 'Name', - 'console.settings.section.members.labels.email' => 'Email', - 'console.settings.section.members.labels.role' => 'Role', - 'console.settings.section.members.invite.success' => 'Invitation Sent Successfully', - 'console.settings.section.members.invite.failure' => 'Failed to Send Invite', - 'console.settings.section.members.leave.success' => 'Member Removed Successfully', - 'console.settings.section.members.leave.failure' => 'Failed to Remove Member', - - 'console.home.title' => 'Console', - - 'console.database.title' => 'Database', - - 'console.storage.title' => 'Storage', - - 'console.users.title' => 'Users', - 'console.users.section.users.title' => 'Users', - 'console.users.section.teams.title' => 'Teams', - 'console.users.section.providers.title' => 'Providers', - 'console.users.section.templates.title' => 'Templates', - - 'console.webhooks.title' => 'Webhooks', - 'console.keys.title' => 'API Keys', - 'console.tasks.title' => 'Tasks', // Service - Users 'auth.emails.team' => '%s Team', diff --git a/app/config/locale/he.php b/app/config/locale/he.php index d5ef84991..33ac3beaa 100644 --- a/app/config/locale/he.php +++ b/app/config/locale/he.php @@ -1,9 +1,13 @@ '"The art of being wise is the art of knowing what to overlook."', 'settings.locale' => 'he', 'settings.direction' => 'rtl', + // General + 'general.loading' => 'Loading...', + // Service - Users 'auth.emails.team' => 'צוות %s', 'auth.emails.confirm.title' => 'אימות חשבון', diff --git a/app/controllers/console.php b/app/controllers/console.php index 4c7f6f4fc..222ec917c 100644 --- a/app/controllers/console.php +++ b/app/controllers/console.php @@ -66,7 +66,7 @@ $utopia->get('/console') ; $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.title')) + ->setParam('title', APP_NAME.' - Console') ->setParam('body', $page); }); @@ -83,7 +83,7 @@ $utopia->get('/console/account') ; $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.account.title')) + ->setParam('title', 'Account - ' . APP_NAME) ->setParam('body', $page); }); @@ -95,7 +95,7 @@ $utopia->get('/console/notifications') $page = new View(__DIR__.'/../views/v1/console/notifications/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.notifications.title')) + ->setParam('title', APP_NAME.' - Notifications') ->setParam('body', $page); }); @@ -107,7 +107,7 @@ $utopia->get('/console/home') $page = new View(__DIR__.'/../views/console/home/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.home.title')) + ->setParam('title', APP_NAME.' - Console') ->setParam('body', $page); }); @@ -119,7 +119,7 @@ $utopia->get('/console/settings') $page = new View(__DIR__.'/../views/console/settings/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.settings.title')) + ->setParam('title', APP_NAME.' - Settings') ->setParam('body', $page); }); @@ -131,7 +131,7 @@ $utopia->get('/console/webhooks') $page = new View(__DIR__.'/../views/console/webhooks/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.webhooks.title')) + ->setParam('title', APP_NAME.' - Webhooks') ->setParam('body', $page); }); @@ -143,7 +143,7 @@ $utopia->get('/console/keys') $page = new View(__DIR__.'/../views/console/keys/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.keys.title')) + ->setParam('title', APP_NAME.' - API Keys') ->setParam('body', $page); }); @@ -155,7 +155,7 @@ $utopia->get('/console/tasks') $page = new View(__DIR__.'/../views/console/tasks/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.tasks.title')) + ->setParam('title', APP_NAME.' - Tasks') ->setParam('body', $page); }); @@ -167,7 +167,7 @@ $utopia->get('/console/database') $page = new View(__DIR__.'/../views/console/database/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.database.title')) + ->setParam('title', APP_NAME.' - Database') ->setParam('body', $page); }); @@ -190,7 +190,7 @@ $utopia->get('/console/database/collection') ; $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.database.title')) + ->setParam('title', APP_NAME.' - Database') ->setParam('body', $page); }); @@ -202,7 +202,7 @@ $utopia->get('/console/storage') $page = new View(__DIR__.'/../views/console/storage/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.storage.title')) + ->setParam('title', APP_NAME.' - Storage') ->setParam('body', $page); }); diff --git a/app/controllers/home.php b/app/controllers/home.php index 03e00120c..58f5b7e1d 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -9,7 +9,7 @@ use Utopia\Locale\Locale; $layout ->setParam('title', APP_NAME) - ->setParam('description', Locale::getText('general.description')) + ->setParam('description', '') ->setParam('class', 'home') ->setParam('header', [new View(__DIR__.'/../views/home/comps/header.phtml')]) ; @@ -35,7 +35,7 @@ $utopia->get('/auth/signin') $page = new View(__DIR__.'/../views/home/auth/signin.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.signin.title').' - '.APP_NAME) + ->setParam('title', 'Sign In - '.APP_NAME) ->setParam('body', $page); }); @@ -47,7 +47,7 @@ $utopia->get('/auth/signup') $page = new View(__DIR__.'/../views/home/auth/signup.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.signup.title').' - '.APP_NAME) + ->setParam('title', 'Sign Up - '.APP_NAME) ->setParam('body', $page); }); @@ -59,7 +59,7 @@ $utopia->get('/auth/recovery') $page = new View(__DIR__.'/../views/home/auth/recovery.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.recovery.title').' - '.APP_NAME) + ->setParam('title', 'Password Recovery - '.APP_NAME) ->setParam('body', $page); }); @@ -71,7 +71,7 @@ $utopia->get('/auth/confirm') $page = new View(__DIR__.'/../views/home/auth/confirm.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.confirm.title').' - '.APP_NAME) + ->setParam('title', 'Account Confirmation - '.APP_NAME) ->setParam('body', $page); }); @@ -83,7 +83,7 @@ $utopia->get('/auth/join') $page = new View(__DIR__.'/../views/home/auth/join.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.join.title').' - '.APP_NAME) + ->setParam('title', 'Invitation - '.APP_NAME) ->setParam('body', $page); }); @@ -95,7 +95,7 @@ $utopia->get('/auth/recovery/reset') $page = new View(__DIR__.'/../views/home/auth/recovery/reset.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.reset.title').' - '.APP_NAME) + ->setParam('title', 'Password Reset - '.APP_NAME) ->setParam('body', $page); }); diff --git a/app/controllers/shared/web.php b/app/controllers/shared/web.php index 6a2a354b3..ffaa6a5b8 100644 --- a/app/controllers/shared/web.php +++ b/app/controllers/shared/web.php @@ -6,9 +6,9 @@ use Utopia\Locale\Locale; Locale::$exceptions = false; $roles = [ - ['type' => 'owner', 'label' => Locale::getText('general.roles.owner')], - ['type' => 'developer', 'label' => Locale::getText('general.roles.developer')], - ['type' => 'admin', 'label' => Locale::getText('general.roles.admin')], + ['type' => 'owner', 'label' => 'Owner'], + ['type' => 'developer', 'label' => 'Developer'], + ['type' => 'admin', 'label' => 'Admin'], ]; $layout = new View(__DIR__.'/../../views/layouts/default.phtml'); @@ -20,7 +20,6 @@ if (!empty($request->getQuery('version', ''))) { $layout ->setParam('title', APP_NAME) - ->setParam('description', Locale::getText('general.description')) ->setParam('protocol', $request->getServer('REQUEST_SCHEME', 'https')) ->setParam('domain', $domain) ->setParam('home', $request->getServer('_APP_HOME')) diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml index 5d9b9b1d9..92c635e3c 100644 --- a/app/views/console/account/index.phtml +++ b/app/views/console/account/index.phtml @@ -4,7 +4,7 @@ use Utopia\Locale\Locale; ?>

- + Account

@@ -19,7 +19,7 @@ use Utopia\Locale\Locale; data-failure="trigger" data-failure-param-trigger-events="logout"> -

+

Overview

@@ -35,14 +35,14 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Failed to update your name" data-failure-param-alert-classname="error"> - +
- +
@@ -64,18 +64,18 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Failed updating email address" data-failure-param-alert-classname="error"> - +
-
- +
+
-   +  
@@ -84,8 +84,8 @@ use Utopia\Locale\Locale;
-
-

+
+

Update Password

- + - +
-   +  
@@ -122,7 +122,7 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Logout failed" data-failure-param-alert-classname="error"> - +
@@ -133,25 +133,25 @@ use Utopia\Locale\Locale;
- + Upload
- ( gravatar.com ) + (via gravatar.com )
-

+

Danger Zone

-

+

This is the area where you can delete your account.

-

+

By deleting your account you will lose access to any of your teams and shared data.

-

+

PLEASE NOTICE: Account deletion is irreversible.

- +
@@ -172,9 +172,9 @@ use Utopia\Locale\Locale;
  • -

    +

    Security

    -

    +

    Devices and Sessions

    - + @@ -213,10 +213,10 @@ use Utopia\Locale\Locale; data-success-param-trigger-events="logout" data-success-param-redirect-url="/" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>" + data-failure-param-alert-text="Logout from Session Failed" data-failure-param-alert-classname="error"> - + @@ -225,7 +225,7 @@ use Utopia\Locale\Locale; on   - + Current Session
    @@ -244,10 +244,10 @@ use Utopia\Locale\Locale; data-success-param-trigger-events="session-delete" data-success-redirect-url="/" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('console.account.section.security.devices.logout-all')); ?>" + data-failure-param-alert-text="Logout from All Sessions Failed" data-failure-param-alert-classname="error"> - +
  • @@ -263,26 +263,26 @@ use Utopia\Locale\Locale; - - - - - + + + + + - - - + + - - +
    DateEventClientLocationIP
    + +
    diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml index 45fde94c9..db8e4c6ac 100644 --- a/app/views/console/database/index.phtml +++ b/app/views/console/database/index.phtml @@ -4,7 +4,7 @@ use Utopia\Locale\Locale; ?>

    - + Database

    diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml index a8f511cf4..d9db97fc3 100644 --- a/app/views/console/keys/index.phtml +++ b/app/views/console/keys/index.phtml @@ -17,7 +17,7 @@ $scopes = [ // TODO sync with project list ?>

    - + API Keys

    - + Settings

    @@ -22,7 +22,7 @@ use Utopia\Locale\Locale;
    • -

      +

      Overview

    • -

      +

      Members

      - + User Avatar
      -       +      
    -
    +
    -

    +

    Invite Member

    - + - + - +
    - -   + +  
    diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml index a3a964ea8..bb32b037e 100644 --- a/app/views/console/storage/index.phtml +++ b/app/views/console/storage/index.phtml @@ -4,7 +4,7 @@ use Utopia\Locale\Locale;

    - + Storage

    diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml index 0915f8a14..cd5c00032 100644 --- a/app/views/console/tasks/index.phtml +++ b/app/views/console/tasks/index.phtml @@ -5,7 +5,7 @@ use Utopia\Locale\Locale; ?>

    - + Tasks

    - - - - - + Date + Event + Client + Location + IP - - - + + + - + - + diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml index 15c9a02eb..e6fed97ae 100644 --- a/app/views/console/webhooks/index.phtml +++ b/app/views/console/webhooks/index.phtml @@ -18,7 +18,7 @@ $events = [ ?>

    - + Webhooks

    diff --git a/app/views/home/auth/confirm.phtml b/app/views/home/auth/confirm.phtml index a2373ff91..955a2d073 100644 --- a/app/views/home/auth/confirm.phtml +++ b/app/views/home/auth/confirm.phtml @@ -10,13 +10,13 @@ use Utopia\Locale\Locale; data-param-user-id="{{router.params.userId}}" data-success="redirect,alert,trigger" data-success-redirect-url="/console" - data-success-alert="escape(Locale::getText('home.auth.confirm.success')); ?>" + data-success-alert="Confirmation Completed Successfully" data-success-triggers="account.update" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('home.auth.confirm.failure')); ?>" + data-failure-param-alert-text="Confirmation Failed" data-failure-param-alert-classname="error"> -

    escape(Locale::getText('home.auth.confirm.title')); ?>

    -

    escape(Locale::getText('home.auth.confirm.subtitle')); ?>

    +

    Account Confirmation in Progress

    +

    Please wait a few seconds while your account is verified.

    diff --git a/app/views/home/auth/join.phtml b/app/views/home/auth/join.phtml index 9b6bc01c9..a70508dd6 100644 --- a/app/views/home/auth/join.phtml +++ b/app/views/home/auth/join.phtml @@ -11,13 +11,13 @@ use Utopia\Locale\Locale; data-param-secret="{{router.params.secret}}" data-success="redirect,alert,trigger" data-success-redirect-url="/console?project={{router.params.project}}" - data-success-alert="escape(Locale::getText('home.auth.join.success')); ?>" + data-success-alert="Joined Team Successfully" data-success-triggers="account.update" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('home.auth.join.failure')); ?>" + data-failure-param-alert-text="Failed to join team. Please try again later" data-failure-param-alert-classname="error"> - + @@ -31,9 +31,9 @@ use Utopia\Locale\Locale; data-success="trigger" data-success-triggers="api-company.load"> -

    escape(Locale::getText('home.auth.join.title')); ?>

    +

    Invitation

    -

    escape(Locale::getText('home.auth.join.subtitle')), ''); ?>

    +

    You have been invited to join team on

    @@ -46,14 +46,13 @@ use Utopia\Locale\Locale;
    - escape(Locale::getText('home.auth.join.agree')), - '' . $this->escape(Locale::getText('home.auth.join.terms')) . '', - '' . $this->escape(Locale::getText('home.auth.join.privacy')) . ''); ?> + + By accepting the invitation, you agree to the Terms and Conditions and Privacy Policy.
    - - escape(Locale::getText('home.auth.join.cancel')); ?> + + Cancel
    \ No newline at end of file diff --git a/app/views/home/auth/recovery.phtml b/app/views/home/auth/recovery.phtml index 8985347bc..4a82c54f8 100644 --- a/app/views/home/auth/recovery.phtml +++ b/app/views/home/auth/recovery.phtml @@ -3,30 +3,30 @@ use Utopia\Locale\Locale; ?>

    - escape(Locale::getText('home.auth.recovery.title')); ?> + Password Recovery

    - * escape(Locale::getText('home.auth.recovery.required')); ?> + * All fields are required
    - + - +
    - escape(Locale::getText('home.auth.recovery.back')); ?> + Back to sign in
    diff --git a/app/views/home/auth/recovery/reset.phtml b/app/views/home/auth/recovery/reset.phtml index 14d42e0e2..313d54315 100644 --- a/app/views/home/auth/recovery/reset.phtml +++ b/app/views/home/auth/recovery/reset.phtml @@ -3,10 +3,10 @@ use Utopia\Locale\Locale; ?>

    - escape(Locale::getText('home.auth.reset.title')); ?> + Password Reset

    - * escape(Locale::getText('home.auth.reset.required')); ?> + * All fields are required

    @@ -16,21 +16,21 @@ use Utopia\Locale\Locale; data-scope="console" data-event="submit" data-success="alert,redirect" - data-success-alert="escape(Locale::getText('home.auth.reset.success')); ?>" + data-success-alert="Password Reset Completed" data-success-redirect-url="/auth/signin" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('home.auth.reset.failure')); ?>" + data-failure-param-alert-text="Password Reset Failed" data-failure-param-alert-classname="error"> - - + + - - + + - +
    \ No newline at end of file diff --git a/app/views/home/auth/signin.phtml b/app/views/home/auth/signin.phtml index 2baf2bf11..d6a279926 100644 --- a/app/views/home/auth/signin.phtml +++ b/app/views/home/auth/signin.phtml @@ -3,12 +3,12 @@ use Utopia\Locale\Locale; ?>

    - escape(Locale::getText('home.auth.signin.title')); ?> + Sign In

    - + -

    escape(Locale::getText('home.auth.signin.regular.title')); ?>

    +

    Login using email and password

    - + - + - +


    - escape(Locale::getText('home.auth.signin.labels.action2')); ?> escape(Locale::getText('home.auth.signin.labels.or')); ?> escape(Locale::getText('home.auth.signin.labels.action3')); ?> + Forgot password? or don't have an account? Sign up now
    \ No newline at end of file diff --git a/app/views/home/auth/signup.phtml b/app/views/home/auth/signup.phtml index 4f4d31dfa..f62b9945b 100644 --- a/app/views/home/auth/signup.phtml +++ b/app/views/home/auth/signup.phtml @@ -4,12 +4,12 @@ use Utopia\Locale\Locale; ?> \ No newline at end of file diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml index 15b3c3d28..2d0b97eea 100644 --- a/app/views/layouts/default.phtml +++ b/app/views/layouts/default.phtml @@ -91,7 +91,7 @@ $canonical = $this->getParam('canonical', '');
    -
    +
      @@ -101,7 +101,7 @@ $canonical = $this->getParam('canonical', ''); - + Learn More