Skip to content

Commit

Permalink
fix translation issues & formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
mohitpanjwani committed Dec 9, 2020
1 parent c908674 commit 034c7e3
Show file tree
Hide file tree
Showing 16 changed files with 1,257 additions and 89 deletions.
4 changes: 2 additions & 2 deletions app/Models/Estimate.php
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,8 @@ public function getPDFData()
$company = Company::find($this->company_id);
$logo = $company->getMedia('logo')->first();

$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';

if ($logo && $isLocalhost && $isSystem) {
$logo = $logo->getPath();
Expand Down
3 changes: 2 additions & 1 deletion app/Models/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ public function getPDFData()

$logo = $company->getMedia('logo')->first();

$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';

if ($logo && $isLocalhost && $isSystem) {
Expand All @@ -533,6 +533,7 @@ public function getPDFData()
'labels' => $labels,
'taxes' => $taxes
]);

return PDF::loadView('app.pdf.invoice.' . $invoiceTemplate->view);
}

Expand Down
3 changes: 1 addition & 2 deletions app/Models/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public function getPDFData()

$logo = $company->getMedia('logo')->first();

$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';

if ($logo && $isLocalhost && $isSystem) {
Expand All @@ -384,7 +384,6 @@ public function getPDFData()
$logo = $logo->getFullUrl();
}


view()->share([
'payment' => $this,
'company_address' => $this->getCompanyAddress(),
Expand Down
4 changes: 3 additions & 1 deletion config/crater.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
["code"=>"fr", "name" => "French"],
["code"=>"de", "name" => "German"],
["code"=>"it", "name" => "Italian"],
["code"=>"pt-br", "name" => "Portuguese (Brazilian)"],
["code"=>"pt_BR", "name" => "Portuguese (Brazilian)"],
["code"=>"es", "name" => "Spanish"],
["code"=>"lv", "name" => "Latvian"],
["code"=>"sr_LA", "name" => "Serbian Latin"],
],

/*
Expand Down
2 changes: 1 addition & 1 deletion public/assets/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/assets/js/app.js": "/assets/js/app.js?id=266a3a761d18a0b0839e",
"/assets/js/app.js": "/assets/js/app.js?id=bb2c4150e0caffb9f475",
"/assets/css/crater.css": "/assets/css/crater.css?id=180193a313e33aed1712"
}
13 changes: 6 additions & 7 deletions resources/assets/js/plugins/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"you_got_lost": "عفواً! يبدو أنك قد تهت!",
"go_home": "عودة إلى الرئيسية",
"test_mail_conf": "اختبار تكوين البريد",
"send_mail_successfully": "Mail sent successfully",
"send_mail_successfully": "تم إرسال البريد بنجاح",
"setting_updated": "تم تحديث الإعدادات بنجاح",
"select_state": "اختر الولاية/المنطقة",
"select_country": "اختر الدولة",
Expand All @@ -84,8 +84,8 @@
"street_2": "عنوان الشارع 2",
"action_failed": "فشلت العملية",
"retry": "أعد المحاولة",
"choose_note": "Choose Note",
"no_note_found": "No Note Found",
"choose_note": "اختر ملاحظة",
"no_note_found": "لم يتم العثور على الملاحظة",
"insert_note": "أدخل ملاحظة"
},
"dashboard": {
Expand Down Expand Up @@ -143,8 +143,8 @@
"add_customer": "إضافة عميل",
"contacts_list": "قائمة العملاء",
"name": "الاسم",
"mail": "Mail | Mails",
"statement": "Statement",
"mail": "البريد",
"statement": "البيان",
"display_name": "اسم العرض",
"primary_contact_name": "اسم التواصل الرئيسي",
"contact_name": "اسم تواصل آخر",
Expand All @@ -153,7 +153,7 @@
"address": "العنوان",
"phone": "الهاتف",
"website": "موقع الإنترنت",
"overview": "Overview",
"overview": "استعراض",
"enable_portal": "Enable Portal",
"country": "الدولة",
"state": "الولاية/المنطقة",
Expand Down Expand Up @@ -980,7 +980,6 @@
"default_driver": "برنامج التشغيل الافتراضي",
"is_default": "أمر افتراضي",
"set_default_disk": "تعيين القرص الافتراضي",
"set_default_disk_confirm": "This disk will be set as default and all the new PDFs will be saved on this disk",
"success_set_default_disk": "Disk set as default successfully",
"save_pdf_to_disk": "حفظ ملفات PDF على القرص",
"disk_setting_description": "قم بتمكين هذا ، إذا كنت ترغب في حفظ نسخة من كل فاتورة ، تقدير وإيصال دفع PDF على القرص الافتراضي الخاص بك تلقائيًا. سيؤدي تشغيل هذا الخيار إلى تقليل وقت التحميل عند عرض ملفات PDF.",
Expand Down
5 changes: 2 additions & 3 deletions resources/assets/js/plugins/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,6 @@
"default_driver": "Default Driver",
"is_default": "IS DEFAULT",
"set_default_disk": "Set Default Disk",
"set_default_disk_confirm": "This disk will be set as default and all the new PDFs will be saved on this disk",
"success_set_default_disk": "Disk set as default successfully",
"save_pdf_to_disk": "Save PDFs to Disk",
"disk_setting_description": " Enable this, if you wish to save a copy of each Invoice, Estimate & Payment Receipt PDF on your default disk automatically. Turning this option will decrease the load-time when viewing the PDFs.",
Expand Down Expand Up @@ -1130,7 +1129,7 @@
"address_maxlength": "Die Adresse sollte nicht länger als 255 Zeichen sein.",
"ref_number_maxlength": "Ref Number sollte nicht länger als 255 Zeichen sein.",
"prefix_maxlength": "Das Präfix sollte nicht länger als 5 Zeichen sein.",
"something_went_wrong": "Etwas ist falsch gelaufen"
"something_went_wrong": "Da ist etwas schief gelaufen"
},
"pdf_estimate_label": "Kostenvoranschlag",
"pdf_estimate_number": "Kostenvoran. Nummer",
Expand Down Expand Up @@ -1166,6 +1165,6 @@
"pdf_tax_types_label": "Steuersätze",
"pdf_expenses_label": "Gesamtausgaben",
"pdf_bill_to": "Rechnungsempfänger,",
"pdf_ship_to": "Versand ein,",
"pdf_ship_to": "Versand an,",
"pdf_received_from": "Received from:"
}
1 change: 1 addition & 0 deletions resources/assets/js/plugins/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@
"download_zip_file": "Download ZIP file",
"unzipping_package": "Unzipping Package",
"copying_files": "Copying Files",
"deleting_files": "Deleting Unused files",
"running_migrations": "Running Migrations",
"finishing_update": "Finishing Update",
"update_failed": "Update Failed",
Expand Down
5 changes: 2 additions & 3 deletions resources/assets/js/plugins/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"general": {
"add_company": "Add Company",
"view_pdf": "Ver PDF",
"copy_pdf_url": "Copiar URL del PDF",
"copy_pdf_url": "Copy PDF Url",
"download_pdf": "Descargar PDF",
"save": "Guardar",
"create": "Create",
Expand Down Expand Up @@ -339,7 +339,7 @@
"notes": "Notas",
"view": "Ver",
"send_invoice": "Enviar la factura",
"resend_invoice": "Reenviar la factura",
"resend_invoice": "Resend Invoice",
"invoice_template": "Plantilla de factura",
"template": "Modelo",
"mark_as_sent": "Marcar como enviada",
Expand Down Expand Up @@ -980,7 +980,6 @@
"default_driver": "Default Driver",
"is_default": "IS DEFAULT",
"set_default_disk": "Set Default Disk",
"set_default_disk_confirm": "This disk will be set as default and all the new PDFs will be saved on this disk",
"success_set_default_disk": "Disk set as default successfully",
"save_pdf_to_disk": "Save PDFs to Disk",
"disk_setting_description": " Enable this, if you wish to save a copy of each Invoice, Estimate & Payment Receipt PDF on your default disk automatically. Turning this option will decrease the load-time when viewing the PDFs.",
Expand Down
25 changes: 12 additions & 13 deletions resources/assets/js/plugins/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"phone": "Téléphone",
"website": "Site Internet",
"overview": "Overview",
"enable_portal": "Enable Portal",
"enable_portal": "Activer le portail",
"country": "Pays",
"state": "Etat",
"city": "Ville",
Expand Down Expand Up @@ -253,7 +253,7 @@
"convert_to_invoice": "Convertir en facture",
"mark_as_sent": "Marquer comme envoyé",
"send_estimate": "Envoyer un devis",
"resend_estimate": "Resend Estimate",
"resend_estimate": "Renvoyer le devis",
"record_payment": "Enregistrer un paiement",
"add_estimate": "Ajouter un devis",
"save_estimate": "Sauvegarder le devis",
Expand Down Expand Up @@ -339,7 +339,7 @@
"notes": "Remarques",
"view": "Voir",
"send_invoice": "Envoyer une facture",
"resend_invoice": "Resend Invoice",
"resend_invoice": "Renvoyer la facture",
"invoice_template": "Modèle de facture",
"template": "Modèle",
"mark_as_sent": "Marquer comme envoyé",
Expand Down Expand Up @@ -679,7 +679,7 @@
"edit_custom_field": "Modifier un champ personnalisé",
"field_name": "Nom de domaine",
"label": "Étiquette",
"type": "Type",
"type": "Type ",
"name": "Nom",
"required": "Obligatoire",
"placeholder": "Espace réservé",
Expand Down Expand Up @@ -713,7 +713,7 @@
"save": "Sauvegarder",
"addresses": {
"title": "Adresses",
"section_description": "You can set Customer Billing Address and Customer Shipping Address Format (Displayed in PDF only). ",
"section_description": "Vous pouvez définir le format de l'adresse de facturation et de livraison du client (affiché en PDF uniquement). ",
"customer_billing_address": "Adresse de paiement",
"customer_shipping_address": "Adresse de livraison",
"company_address": "Adresse de l'entreprise",
Expand All @@ -722,7 +722,7 @@
"address": "Addresse",
"display_name": "Nom",
"primary_contact_name": "Nom du contact principal",
"email": "Email",
"email": "Adresse email",
"website": "Site Internet",
"name": "Nom",
"country": "Pays",
Expand Down Expand Up @@ -758,7 +758,7 @@
"estimate_settings": "Paramètre",
"autogenerate_estimate_number": "Générer automatiquement le numéro de devis",
"estimate_setting_description": "Désactivez cette option si vous ne souhaitez pas générer automatiquement les numéros de devis à chaque fois que vous en créez un nouveau.",
"enter_estimate_prefix": "Enter estmiate prefix",
"enter_estimate_prefix": "Entrez le préfixe d'estimation",
"estimate_setting_updated": "Paramètres de devis mis à jour",
"company_address_format": "Format d'adresse de l'entreprise",
"billing_address_format": "Format d'adresse de facturation",
Expand Down Expand Up @@ -802,7 +802,7 @@
"title": "Remarques",
"description": "Gagnez du temps en créant des notes et en les réutilisant sur vos factures, devis et paiements.",
"notes": "Remarques",
"type": "Type",
"type": "Type ",
"add_note": "Ajouter une note",
"add_new_note": "Ajouter une nouvelle note",
"name": "Nom",
Expand All @@ -817,7 +817,7 @@
"account_settings": {
"profile_picture": "Image de profil",
"name": "Nom",
"email": "Email",
"email": "Adresse email",
"password": "Mot de passe",
"confirm_password": "Confirmez le mot de passe",
"account_settings": "Paramètres du compte",
Expand All @@ -827,7 +827,7 @@
},
"user_profile": {
"name": "Nom",
"email": "Email",
"email": "Adresse email",
"password": "Mot de passe",
"confirm_password": "Confirmez le mot de passe"
},
Expand Down Expand Up @@ -892,7 +892,7 @@
"updated_message": "Préférences mises à jour avec succès",
"select_language": "Choisir la langue",
"select_time_zone": "sélectionnez le fuseau horaire",
"select_date_format": "Select Date Format",
"select_date_format": "Sélectionnez le format de date",
"select_financial_year": "sélectionner lexercice"
},
"update_app": {
Expand All @@ -901,7 +901,7 @@
"check_update": "Vérifier les mises à jour",
"avail_update": "Nouvelle mise à jour disponible",
"next_version": "Version suivante",
"requirements": "Requirements",
"requirements": "Exigences",
"update": "Mettre à jour maintenant",
"update_progress": "Mise à jour en cours...",
"progress_text": "Cela ne prendra que quelques minutes. S'il vous plaît ne pas actualiser l'écran ou fermer la fenêtre avant la fin de la mise à jour",
Expand Down Expand Up @@ -980,7 +980,6 @@
"default_driver": "Pilote par défaut",
"is_default": "EST PAR DÉFAUT",
"set_default_disk": "Définir le disque par défaut",
"set_default_disk_confirm": "This disk will be set as default and all the new PDFs will be saved on this disk",
"success_set_default_disk": "Disk set as default successfully",
"save_pdf_to_disk": "Enregistrer les PDF sur le disque",
"disk_setting_description": "Activez cette option si vous souhaitez enregistrer automatiquement une copie de chaque facture, devis et reçu de paiement PDF sur votre disque par défaut. L'activation de cette option réduira le temps de chargement lors de l'affichage des PDF.",
Expand Down
2 changes: 2 additions & 0 deletions resources/assets/js/plugins/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import pt_BR from './pt-br.json'
import it from './it.json'
import sr_LA from './sr-latn.json'
import nl from './nl.json'
import lv from './lv.json'

Vue.use(VueI18n)

Expand All @@ -24,6 +25,7 @@ const i18n = new VueI18n({
it,
sr_LA,
nl,
lv,
},
})

Expand Down
1 change: 0 additions & 1 deletion resources/assets/js/plugins/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,6 @@
"default_driver": "Default Driver",
"is_default": "IS DEFAULT",
"set_default_disk": "Set Default Disk",
"set_default_disk_confirm": "This disk will be set as default and all the new PDFs will be saved on this disk",
"success_set_default_disk": "Disk set as default successfully",
"save_pdf_to_disk": "Save PDFs to Disk",
"disk_setting_description": " Enable this, if you wish to save a copy of each Invoice, Estimate & Payment Receipt PDF on your default disk automatically. Turning this option will decrease the load-time when viewing the PDFs.",
Expand Down
Loading

0 comments on commit 034c7e3

Please sign in to comment.