New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fr-fr Tranlation (French, Français) #1193

Open
Lagneaux opened this Issue May 30, 2018 · 6 comments

Comments

Projects
None yet
3 participants
@Lagneaux

Lagneaux commented May 30, 2018

Hi,

Quelques traductions sont manquantes. En voici quelques unes :

	"quicklink_today" => "Aujourd'hui",
	"quicklink_yesterday" => "Hier",
	"quicklink_lastWeek" => "Semaine -1",
	"quicklink_lastMonth" => "Mois -1",
	"quicklink_thisWeek" => "Cette semaine",
	"quicklink_thisMonth" => "Ce mois",

fr.zip

Regards
DOm

@simonschaufi

This comment has been minimized.

Member

simonschaufi commented May 30, 2018

@Lagneaux

This comment has been minimized.

Lagneaux commented May 30, 2018

Hi,

I still improve French translations for the "Invoice" tab, attached file!
fr.zip

I also improve the file "Main.php" so that the translations of the invoice billing can match
At .../extensions/ki_invoice/templates/scripts/
main.zip

regards
DOm

@Lagneaux

This comment has been minimized.

Lagneaux commented May 30, 2018

Hi Simonschaufi,

We added them already: https://github.com/kimai/kimai/blob/master/language/fr.php#L376-L381. Are they correct?

Yes, they are correct! Also, your translation is better than mine ...

    'quicklink_today' => "Aujourd'hui",
    'quicklink_yesterday' => "Hier",
    'quicklink_lastWeek' => "Semaine dernière",
    'quicklink_lastMonth' => "Mois dernier",
    'quicklink_thisWeek' => "Cette semaine",
    'quicklink_thisMonth' => "Ce mois",

But I will translate this «Cette semaine» (current week) by «Semaine actuelle» ou «Semaine en cours»(week) for faster reading.

    'quicklink_today' => "Aujourd'hui",
    'quicklink_yesterday' => "Hier",
    'quicklink_lastWeek' => "Semaine dernière",
    'quicklink_lastMonth' => "Mois dernier",
    'quicklink_thisWeek' => "Semaine en cours",
    'quicklink_thisMonth' => "Ce mois",

But not for the Invoice tab, see my post above.
It missed some translations

    'ext_invoice' => [
        'invoiceTitle' => 'Créer une facture',
        'invoiceProject' => 'Tâches',
		'invoiceCustomer' => 'Client',
        'invoiceTimePeriod' => 'Période',
        'invoiceTemplate' => 'Format de facture:',
        'invoiceOptionShort' => 'Facture synthétique',
        'invoiceOptionRound' => 'Durée arrondie',
		'invoiceIncludedEntries' => 'Type de tâches',
		'invoiceCleared_all' => 'Toutes',
		'invoiceCleared_cleared' => 'Validées',
		'invoiceCleared_open' => 'Non validées',
		'invoiceSortOrder' => 'Ordre de tries',
		'invoiceOrderDateAsc' => 'Par dates décroissantes',
		'invoiceOrderDateDesc' => 'Par dates croissantes',
		'invoiceActivity' => 'Par tâches',
		'invoiceMarkEntriesAsCleared' => 'Marquer les entrées comme effacées',
        'invoiceButton' => 'Créer',
        'noData' => 'Il n\' y a pas de données de temps pour le projet et la période choisis.',
        'noProject' => 'Aucun projet n\'a été sélectionné.',
        'defaultVat' => 'TVA par défaut'
    ],

Then, It will modify, of course, the main.php file of the extension "Invoice"

<div id="invoice_extension_wrap">
    <div id="invoice_extension">
        <form id="invoice_extension_form" method="post" action="../extensions/ki_invoice/print.php" target="_blank">
            <div id="invoice_extension_advanced">
                <div>
                    <label for="invoice_customerID"><?php echo $this->translate('ext_invoice:invoiceCustomer') ?></label>
                    <?php echo $this->formSelect('customerID', $this->preselected_customer, [
                        'id' => 'invoice_customerID',
                        'class' => 'formfield'
                    ], $this->customers); ?>
                </div>
                <div>
                    <label for="invoice_projectID"><?php echo $this->translate('ext_invoice:invoiceProject') ?></label>
                    <?php echo $this->formSelect('projectID[]', $this->preselected_project, [
                        'id' => 'invoice_projectID',
                        'class' => 'formfield',
                        'multiple' => 'multiple'
                    ], $this->projects); ?>
                </div>
                <div>
                    <label for="invoice_start_day"><?php echo $this->translate('ext_invoice:invoiceTimePeriod') ?></label>
                    <input id="invoice_start_day" type="text" name="invoice_start_day" value="<?php echo $this->escape($this->start_day) ?>" maxlength="10" size="10" tabindex="6" />
                    -
                    <input id="invoice_end_day" type="text" name="invoice_end_day" value="<?php echo $this->escape($this->end_day) ?>" maxlength="10" size="10" tabindex="7" />
                </div>
                <div>
                    <label for="invoice_form_docs"><?php echo $this->translate('ext_invoice:invoiceTemplate') ?></label>
                    <?php
                    echo $this->formSelect(
                        'ivform_file',
                        null,
                        [
                            'id' => 'invoice_form_docs',
                            'class' => 'formfield'
                        ],
                        $this->invoice_templates
                    );
                    ?>
                </div>
                <div>
                    <label><?php echo $this->translate('ext_invoice:defaultVat') ?></label>
                    <span id="defaultVat"><?php echo $this->escape(str_replace('.', $this->kga['conf']['decimalSeparator'], $this->kga->getDefaultVat())) ?></span>
                    % (<a id="editVatLink" href="#"><?php echo $this->translate('change') ?></a>)
                </div>
                <div>
                    <label for="short_invoice"><?php echo $this->translate('ext_invoice:invoiceOptionShort') ?></label>
                    <input type="checkbox" id="short_invoice" name="short">
                </div>
                <div>
                    <label for="invoice_round_ID"><?php echo $this->translate('ext_invoice:invoiceOptionRound') ?></label>
                    <?php echo $this->formSelect('roundValue', null, [
                        'id' => 'invoice_round_ID',
                        'class' => 'formfield'
                    ], $this->roundingOptions); ?>
                </div>
                <div>
                    <label for="filter_cleared"><?php echo $this->translate('ext_invoice:invoiceIncludedEntries') ?></label>
                    <select id="filter_cleared" name="filter_cleared">
                        <option value="-1" <?php if (!$this->kga->getSettings()->isHideClearedEntries()): ?> selected="selected" <?php endif; ?>><?php echo $this->translate('ext_invoice:invoiceCleared_all') ?></option>
                        <option value="1"><?php echo $this->translate('ext_invoice:invoiceCleared_cleared') ?></option>
                        <option value="0" <?php if ($this->kga->getSettings()->isHideClearedEntries()): ?> selected="selected" <?php endif; ?>><?php echo $this->translate('ext_invoice:invoiceCleared_open') ?></option>
                    </select>
                </div>
                <div>
                    <label for="sort_invoice"><?php echo $this->translate('ext_invoice:invoiceSortOrder') ?></label>
                    <select name="sort_invoice" id="sort_invoice">
                        <option value="date_asc"><?php echo $this->translate('ext_invoice:invoiceOrderDateAsc') ?></option>
                        <option value="date_desc"><?php echo $this->translate('ext_invoice:invoiceOrderDateDesc') ?></option>
                        <option value="name"><?php echo $this->translate('ext_invoice:invoiceActivity') ?></option>
                    </select>
                </div>
	            <div>
		            <label for="mark_entries_as_cleared"><?php echo $this->translate('ext_invoice:invoiceMarkEntriesAsCleared') ?></label>
		            <input type="checkbox" id="mark_entries_as_cleared" name="mark_entries_as_cleared" value="1">
	            </div>
                <div id="invoice_button">
                    <input type="submit" class="btn_ok" value="<?php echo $this->translate('ext_invoice:invoiceButton') ?>">
                </div>
            </div>
        </form>
    </div>
</div>

# Here are the modified files:
main.zip
fr.zip

Cheers
DOm

@kevinpapst

This comment has been minimized.

Member

kevinpapst commented May 31, 2018

Hi @Lagneaux ,
thanks for your input and contribution.
Can you please add these changes into a new branch in your forked repository and sent them in as Pull request?
There are fantastic tutorials out there if you are new to Git and GitHub.

@Lagneaux

This comment has been minimized.

Lagneaux commented Jun 1, 2018

@kevinpapst

This comment has been minimized.

Member

kevinpapst commented Jun 1, 2018

Thats the way how to contribute to an open source project, you can read more about it:
https://opensource.guide/how-to-contribute/#opening-a-pull-request
The first time is weird ;-) but its easier than it sounds!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment