Merge branch 'main' of github.com:AndresMorelos/Invoncify

Author: AndresMorelos

README.md

@@ -29,7 +29,7 @@ A desktop application for creating invoices with beautiful and customizable temp
 Do you speak multiple languages? We need your help!
 
 If you're interested in translating Invoncify, please see the [detailed instruction here](https://github.com/AndresMorelos/Invoncify/discussions/31).
-The following languages are currently being translated, if you would like to Manta to support another language, [please submit your request here]https://github.com/AndresMorelos/Invoncify/discussions/31).
+The following languages are currently being translated, if you would like to Invoncify to support another language, [please submit your request here](https://github.com/AndresMorelos/Invoncify/discussions/31).
 
 * [🇨🇳 中文 (Chinese Simplified)](https://crowdin.com/project/invoncify/zh-CN)
 * [🇨🇳 中文 (Chinese Traditional)](https://crowdin.com/project/invoncify/zh-TW)
@@ -51,6 +51,8 @@ The following languages are currently being translated, if you would like to Man
 * [🇹🇷 Türkçe (Turkish)](https://crowdin.com/project/invoncify/tr)
 * [🇻🇳 Việt Nam (Vietnamese)](https://crowdin.com/project/invoncify/vi)
 * [🇭🇷 Croatia (Croatian)](https://crowdin.com/project/invoncify/hr)
+* [🇷🇸 Serbian (Cyrillic)](https://crowdin.com/project/invoncify/sr)
+* [🇷🇸 Serbian (Latin)](https://crowdin.com/project/invoncify/sr-CS)
 
 ### Features
 * 🎚 Flexible form. You can turn on/off field and save as default setting.

app/components/form/DueDate.jsx

@@ -57,19 +57,6 @@ export class DueDate extends Component {
     return (
       <Section>
         <label className="itemLabel">{t('form:fields:dueDate:name')}</label>
-        {this.state.useCustom ? (
-          <DueDatePicker
-            t={t}
-            selectedDate={selectedDate}
-            updateCustomDate={this.updateCustomDate}
-          />
-        ) : (
-          <DueDateTerms
-            t={t}
-            paymentTerm={paymentTerm}
-            updatePaymentTerm={this.updatePaymentTerm}
-          />
-        )}
         <div>
           <div className="radio">
             <label>
@@ -94,6 +81,19 @@ export class DueDate extends Component {
             </label>
           </div>
         </div>
+        {this.state.useCustom ? (
+          <DueDatePicker
+            t={t}
+            selectedDate={selectedDate}
+            updateCustomDate={this.updateCustomDate}
+          />
+        ) : (
+          <DueDateTerms
+            t={t}
+            paymentTerm={paymentTerm}
+            updatePaymentTerm={this.updatePaymentTerm}
+          />
+        )}
       </Section>
     );
   }

app/components/form/Recipient.jsx

@@ -121,7 +121,6 @@ export class Recipient extends Component {
     return (
       <Section>
         <label className="itemLabel">{t('form:fields:recipient:name')} *</label>
-        {this.renderComponent()}
         {contacts.length > 0 ? (
           <div>
             <div className="radio">
@@ -148,6 +147,7 @@ export class Recipient extends Component {
             </div>
           </div>
         ) : null}
+        {this.renderComponent()}
       </Section>
     );
   }

app/components/settings/General.jsx

@@ -132,6 +132,9 @@ class General extends Component {
                 <option value="sr">
                   {t('settings:fields:language:sr', { lng: 'sr' })}
                 </option>
+                <option value="sr-CS">
+                  {t('settings:fields:language:sr-CS', { lng: 'sr-CS' })}
+                </option>
                 <option value="nl">
                   {t('settings:fields:language:nl', { lng: 'nl' })}
                 </option>

i18n/en/settings.json

@@ -67,6 +67,7 @@
       "zh-CN": "Chinese (Simplified)",
       "zh-TW": "Chinese (Traditional)",
       "sr": "Serbian (Cyrillic)",
+      "sr-CS": "Serbian (Latin)",
       "ro": "Romanian"
     },
     "importExport": {

i18n/i18n.js

@@ -15,6 +15,7 @@ import zhCN from './zh-CN';
 import sr from './sr';
 import nl from './nl';
 import ro from './ro';
+import srCS from './sr-CS';
 const moment = require('moment');
 const appConfig = require('@electron/remote').require('electron-settings');
 
@@ -37,6 +38,7 @@ i18n.use(initReactI18next).init({
     vi,
     'zh-CN': zhCN,
     sr,
+    'sr-CS': srCS,
     nl,
     ro,
   },

i18n/nl/settings.json

@@ -66,6 +66,7 @@
       "zh-CN": "Chinees (vereenvoudigd)",
       "zh-TW": "Chinees (traditioneel)",
       "sr": "Servisch (Cyrillisch)",
+      "sr-CS": "Servisch (Latin)",
       "ro": "Roemeens"
     },
     "importExport": {

i18n/ro/settings.json

@@ -66,6 +66,7 @@
       "zh-CN": "Chineză (simplificată)",
       "zh-TW": "Chineză (tradiţională)",
       "sr": "Sârbă (alfabet chirilic)",
+      "sr-CS": "Sârbă (alfabet latin)",
       "ro": "Română"
     },
     "importExport": {

i18n/sr-CS/common.json

@@ -0,0 +1,17 @@
+{
+  "fields": {
+    "fullname": "Ime i Prezime",
+    "company": "Preduzeće",
+    "address": "Adresa",
+    "email": "Elektronska pošta",
+    "phone": "Broj Telefona",
+    "website": "Veb sajt"
+  },
+  "save": "Sačuvaj",
+  "amount": "Iznos",
+  "default": "Podrazumevano",
+  "saveAsDefault": "Sačuvaj kao podrazumevano?",
+  "yes": "Da",
+  "noThanks": "Ne, hvala",
+  "details": "Detalji"
+}

i18n/sr-CS/contacts.json

@@ -0,0 +1,9 @@
+{
+  "header": "Svi kontakti",
+  "fields": {
+    "contact": "Kontakt",
+    "email": "Elektronska pošta",
+    "phone": "Telefon",
+    "actions": "Radnje"
+  }
+}