projects / cinny.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8cf0305)
Fix typos and wording
authormoritzdietz <moritzdietz@users.noreply.github.com>
Sat, 31 Jul 2021 14:22:54 +0000 (16:22 +0200)
committermoritzdietz <moritzdietz@users.noreply.github.com>
Sun, 1 Aug 2021 11:38:09 +0000 (13:38 +0200)
README.md patch | blob | history
package.json patch | blob | history
public/index.html patch | blob | history
src/app/organisms/welcome/Welcome.jsx patch | blob | history
src/app/templates/auth/Auth.jsx patch | blob | history
webpack.common.js patch | blob | history

diff --git a/README.md b/README.md
index b3cc043647b281a6b47270a02bca8bad09df2f3d..efba31a7544cfa5c2d0d56bf2388a2d43f4eeb9f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@
 
 ## About <a name = "about"></a>
 
-Cinny is a [matrix](https://matrix.org) client focusing primarily on simple, elegant and secure interface.
+Cinny is a [Matrix](https://matrix.org) client focusing primarily on a simple, elegant and secure interface.
diff --git a/package.json b/package.json
index 286ed47224fd23f3c098169661e564883ae38be1..8a12f353a005a4e6ecc4814cff8a489452d077cc 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cinny",
   "version": "1.0.0",
-  "description": "Organized and powerful matrix client.",
+  "description": "Organized and powerful Matrix client.",
   "main": "index.js",
   "engines": {
     "npm": ">=6.14.11",
diff --git a/public/index.html b/public/index.html
index 280e6dc9ab9d5de27e6a5c99a7cdd2394aa48227..85c015e72fe0f1be9a5c77305056c36395d9e90d 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -7,13 +7,13 @@
     <link href="https://api.fontshare.com/css?f[]=supreme@300,301,400,401,500,501,700,701&display=swap" rel="stylesheet">
     <title>Cinny</title>
     <meta name="name"        content="Cinny">
-    <meta name="description" content="Yet another matrix client. Where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source.">
+    <meta name="description" content="Yet another Matrix client. Where you can enjoy the conversation using a simple, elegant and secure interface protected by e2ee with the power of open source.">
     <meta name="keywords"    content="cinny, cinnyapp, cinnychat, matrix, matrix client, matrix.org, element">
   
     <meta property="og:title"       content="Cinny">
     <meta property="og:url"         content="https://cinny.in">
     <meta property="og:image"       content="https://cinny.in/assets/favicon-48x48.png">
-    <meta property="og:description" content="Yet another matrix client. Where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source.">
+    <meta property="og:description" content="Yet another Matrix client. Where you can enjoy the conversation a using simple, elegant and secure interface protected by e2ee with the power of open source.">
     <meta name="theme-color" content="#000000">
 </head>
 <body id="appBody">
diff --git a/src/app/organisms/welcome/Welcome.jsx b/src/app/organisms/welcome/Welcome.jsx
index 9d9eb7d754363ea16926ec23e82a620c1a6419b8..3b852b9eb1209a492885f526e8314c995a214f6f 100644 (file)
--- a/src/app/organisms/welcome/Welcome.jsx
+++ b/src/app/organisms/welcome/Welcome.jsx
@@ -11,7 +11,7 @@ function Welcome() {
       <div className="flex-v--center">
         <img className="app-welcome__logo noselect" src={CinnySvg} alt="Cinny logo" />
         <Text className="app-welcome__heading" variant="h1">Welcome to Cinny</Text>
-        <Text className="app-welcome__subheading" variant="s1">Yet another matrix client</Text>
+        <Text className="app-welcome__subheading" variant="s1">Yet another Matrix client</Text>
       </div>
     </div>
   );
diff --git a/src/app/templates/auth/Auth.jsx b/src/app/templates/auth/Auth.jsx
index 6392fb31f7e62a819de982a49a49bba55373cba6..4f1d393bc53950c1550f443033efce8e03a7ab64 100644 (file)
--- a/src/app/templates/auth/Auth.jsx
+++ b/src/app/templates/auth/Auth.jsx
@@ -22,8 +22,8 @@ const USER_ID_TOO_LONG_ERROR = 'Your user ID, including the hostname, can\'t be
 
 const PASSWORD_REGEX = /.+/;
 const PASSWORD_STRENGHT_REGEX = /^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d\s:])([^\s]){8,127}$/;
-const BAD_PASSWORD_ERROR = 'Password must contain 1 number, 1 uppercase letters, 1 lowercase letters, 1 non-alpha numeric number, 8-127 characters with no space.';
-const CONFIRM_PASSWORD_ERROR = 'Password don\'t match.';
+const BAD_PASSWORD_ERROR = 'Password must contain at least 1 number, 1 uppercase letter, 1 lowercase letter, 1 non-alphanumeric character. Passwords can range from 8-127 characters with no whitespaces.';
+const CONFIRM_PASSWORD_ERROR = 'Passwords don\'t match.';
 
 const EMAIL_REGEX = /([a-z0-9]+[_a-z0-9.-][a-z0-9]+)@([a-z0-9-]+(?:.[a-z0-9-]+).[a-z]{2,4})/;
 const BAD_EMAIL_ERROR = 'Invalid email address';
@@ -278,7 +278,7 @@ function StaticWrapper({ children }) {
             <img className="app-ident__logo noselect" src={CinnySvg} alt="Cinny logo" />
             <div className="app-ident__text flex-v--center">
               <Text variant="h2">Cinny</Text>
-              <Text variant="b2">Yet another matrix client.</Text>
+              <Text variant="b2">Yet another Matrix client.</Text>
             </div>
           </div>
           { children }
@@ -329,7 +329,7 @@ function Terms({ url, onSubmit }) {
         <div style={{ margin: 'var(--sp-normal)', maxWidth: '450px' }}>
           <Text variant="h2">Agree with terms</Text>
           <div style={{ marginBottom: 'var(--sp-normal)' }} />
-          <Text variant="b1">In order to complete registration, you need to agree with terms and conditions.</Text>
+          <Text variant="b1">In order to complete registration, you need to agree to the terms and conditions.</Text>
           <div style={{ display: 'flex', alignItems: 'center', margin: 'var(--sp-normal) 0' }}>
             <input id="termsCheckbox" type="checkbox" required />
             <Text variant="b1">
diff --git a/webpack.common.js b/webpack.common.js
index b1bcbbc5e8fe2cbced89d87b46e2a0885eab9c82..82305fe65cfa73216eb514344e61ebc7c1f81769 100644 (file)
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -55,7 +55,7 @@ module.exports = {
       devMode: 'light',
       favicons: {
         appName: 'Cinny',
-        appDescription: 'A matrix client',
+        appDescription: 'A Matrix client',
         developerName: 'ajbura, 1997kB',
         developerURL: null,
         icons: {
yet another cinny fork