search

Jalle19 / xbmc-video-server

Web interface for streaming or downloading media from a Kodi/XBMC library
GNU General Public License v3.0
192 stars 39 forks source link

Make the application translatable #90

Closed Jalle19 closed 10 years ago

Jalle19 commented 10 years ago

Reference: http://forum.xbmc.org/showthread.php?tid=168296&pid=1608904#pid1608904

Jalle19 commented 10 years ago

To anyone who wants to work on translations while I finish the support for it (the application is translateble at the moment but there's no interface for switching languages), follow these instructions:

  1. Check out the translation-support branch
  2. Open protected/config/message.php and configure the language array to contain the language(s) you want to translate into.
  3. Run yiic message <path to protected/config/message.php>. This will generate a set of files in protected/messages/<language>.
  4. Fill in the blanks in the files, then submit a pull request to the translation-support branch (not master!).
  5. To change language in the application (for now), edit protected/config/main.php and add 'targetLanguage'=>'sv_se', on line 11 (change sv_se to whatever language you're translating into).

Don't bother with the Swedish translation, I can do that one. Hopefully once I get around to doing that I will add some way of changing the language from the application itself so people don't have to hand edit the configuration file.

If you have any questions feel free to comment here.

Jalle19 commented 10 years ago

The language can now be changed from the "Actions" menu (only in the translation-support branch). The "set as default" functionality is still not implemented.

Galixte commented 10 years ago

Hi :)

thank you for translation-support branch !

I want to work on french translation.

How can i install the "translation-support branch" when I've already installed the "master branch" for test your instructions above ?

Can I install side by side the two versions ?

Best regards, Galixte.

Jalle19 commented 10 years ago

If you're in a terminal you just run git pull once to make sure you have the latest changes, then git checkout translation-support.

I got a message from some guy on the forums suggesting I integrate the project translation in Transifex (the service XBMC and its addons uses for translating) so in the future this process should be way easier.

Galixte commented 10 years ago

Before to do : git checkout translation-support

I have to do : cd htdocs OR : cd htdocs\xbmc-video-server

?

Galixte commented 10 years ago

OK i'm on step 3 : "yiic message < path to protected/config/message.php >. This will generate a set of files in protected/messages/< language >."

What is the exact syntax for this step ?

My file message.php is here : C:\xampp\htdocs\xbmc-video-server\src\protected\config\message.php

Galixte commented 10 years ago

OK, before step 3 you have to run this : cd htdocs\xbmc-video-server\src\protected

Then, the step 3 is : yiic message C:\xampp\htdocs\xbmc-video-server\src\protected\config\message.php

Step 4 is in progress

And after, i don't think if the step 5 is helpful

Galixte commented 10 years ago

I'm always on step 4, and I have translated the file (Replace fr-FR WITH your_language) : C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\Login.php

This translation file is helpful to the login page.

The step 5 doesn't work (set default language in application ?), and i can't see the login page in FRENCH.

I know about your comment : "The language can now be changed from the "Actions" menu (only in the translation-support branch). The "set as default" functionality is still not implemented."

But, How to configure the entire application by default in FRENCH (temporarly in waiting an implementation) ?

Jalle19 commented 10 years ago

I haven't thought about the login page at all, it seems the way the language is changed now may need to be reworked after all. Thanks for the ZIP though, I'll integrate it soon!

Jalle19 commented 10 years ago

@Galixte have you looked at the guides on Github on how to submit pull requests? It would make my job a bit easier, and you'd get to have the commit logged as your own.

Galixte commented 10 years ago

sorry for your inconvenience

Galixte commented 10 years ago

On the Settings page there are five descriptions options who are not translated while the French translation is enabled.

This concerns the following messages in the file :

C:\xampp\htdocs\xbmc-video-server\src\protected\models\Setting.php

The Posts are located here : 'description'=>Yii::t('Settings', 'You may have to right-click and copy the address in order to stream (not download) the file'), in line 162 'description'=>Yii::t('Settings', 'Useful on slow hardware. A refresh button will appear in the menu which flushes the cache'), in line 175 'description'=>Yii::t('Settings', 'Leave empty to disable pagination altogether'), in line 182 'description'=>Yii::t('Settings', 'When checked, streaming will be done over HTTPS if the application is accessed over HTTPS. This will usually only work if the server uses a real signed certificate, thus it is not enabled by default.'), in line 204 'description'=>Yii::t('Settings', "If specified, access is restricted to the defined whitelist. Valid values are IP addresses, IP subnets and domain names (including wildcards). Example: 192.168.1.0/24,1.2.3.4,example.com,*.user.com"), in line 214

Maybe the Element : description is the problem because if i test to replace the element : description with label like this :

'description'=>Yii::t('Settings', 'ENGLISH DESCRIPTION MESSAGE OPTIONS'),

replaced with :

'label'=>Yii::t('Settings', 'ENGLISH DESCRIPTION MESSAGE OPTIONS'),

The French translation works but il's not a good solution because it's a description message option and the message option disappears.

The same situation is located here :

C:\xampp\htdocs\xbmc-video-server\src\protected\views\backend\admin.php

<?php echo FormHelper::helpBlock(Yii::t('Backend', 'This is where you configure your backends. A backend is an instance of XBMC that the application connects to and serves library contents from. If you specify more than one backend, a new item will appear in the main menu, allowing you to easily switch backends.')); ?> in line 12

By opposition, the description messages of the option PROXY in the pages "Create new backend" and "Update Backend" are displayed in French translation.

In some case, the situation will be fixed in doing this :

----------------------Backend Controller--------------------------Translation don't display---------------------------PART. 01------------------------------------------

#
#-----[ OPEN ]------------------------------------------
#
C:\xampp\htdocs\xbmc-video-server\src\protected\views\backend\admin.php

#
#-----[ FIND line 12 ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('Backend', 'This is where you configure your backends. A 
    backend is an instance of XBMC that the application connects to and serves 
    library contents from. If you specify more than one backend, a new item 
    will appear in the main menu, allowing you to easily switch backends.')); ?>

#
#-----[ REPLACE WITH ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('Backend', 'This is where you configure your backends. A backend is an instance of XBMC that the application connects to and serves library contents from. If you specify more than one backend, a new item will appear in the main menu, allowing you to easily switch backends.')); ?>

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------Backend Controller--------------------------Translation don't display---------------------------PART. 02------------------------------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\Backend.php

#
#-----[ FIND line 36 ]------------------------------------------
#
  'This is where you configure your backends. A 
    backend is an instance of XBMC that the application connects to and serves 
    library contents from. If you specify more than one backend, a new item 
    will appear in the main menu, allowing you to easily switch backends.' => '',

#
#-----[ REPLACE WITH ]------------------------------------------
#
'This is where you configure your backends. A backend is an instance of XBMC that the application connects to and serves library contents from. If you specify more than one backend, a new item will appear in the main menu, allowing you to easily switch backends.' => '',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------Model Log--------------------------Translation don't display---------------------------PART. 01------------------------------------------

#
#-----[ OPEN ]------------------------------------------
#
C:\xampp\htdocs\xbmc-video-server\src\protected\views\log\admin.php

#
#-----[ FIND line 10 ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('Log', 'This is the system log. You can sort and 
    filter the table freely to find the information you need. To see the full 
    error message (in case it has been clipped), click the view icon on the 
    right. You can also flush the log by pressing the <i>Flush logs</i> 
    button.')); ?>

#
#-----[ REPLACE WITH ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('Log', 'This is the system log. You can sort and filter the table freely to find the information you need. To see the full error message (in case it has been clipped), click the view icon on the right. You can also flush the log by pressing the <i>Flush logs</i> button.')); ?>

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------Model Log--------------------------Translation don't display---------------------------PART. 02------------------------------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\Log.php

#
#-----[ FIND line 24 ]------------------------------------------
#
  'This is the system log. You can sort and 
    filter the table freely to find the information you need. To see the full 
    error message (in case it has been clipped), click the view icon on the 
    right. You can also flush the log by pressing the <i>Flush logs</i> 
    button.' => '',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'This is the system log. You can sort and filter the table freely to find the information you need. To see the full error message (in case it has been clipped), click the view icon on the right. You can also flush the log by pressing the <i>Flush logs</i> button.' => '',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------Movie Controller--------------------------Translation don't display---------------------------PART. 01------------------------------------------

#
#-----[ OPEN ]------------------------------------------
#
C:\xampp\htdocs\xbmc-video-server\src\protected\views\movie\details.php

#
#-----[ FIND line 30 ]------------------------------------------
#
                        <?php Yii::t('Movies', 'Click the Watch button to start streaming the video (open 
                        the file in your favorite media player), or download the 
                        individual files for later viewing using the links below it.'); ?>

#
#-----[ REPLACE WITH ]------------------------------------------
#
                        <?php Yii::t('Movies', 'Click the Watch button to start streaming the video (open the file in your favorite media player), or download the individual files for later viewing using the links below it.'); ?>

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------Movie Controller--------------------------Translation don't display---------------------------PART. 02------------------------------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\Movies.php

#
#-----[ FIND line 21 ]------------------------------------------
#
  'Click the Watch button to start streaming the video (open 
                        the file in your favorite media player), or download the 
                        individual files for later viewing using the links below it.' => '',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'Click the Watch button to start streaming the video (open the file in your favorite media player), or download the individual files for later viewing using the links below it.' => '',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------Settings Controller--------------------------Translation don't display---------------------------PART. 01------------------------------------------

#
#-----[ OPEN ]------------------------------------------
#
C:\xampp\htdocs\xbmc-video-server\src\protected\views\setting\admin.php

#
#-----[ FIND line 11 ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('Settings', 'This is where you configure global 
    application settings. These settings apply regardless of which backend is 
    currently in use.')); ?>

#
#-----[ REPLACE WITH ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('Settings', 'This is where you configure global application settings. These settings apply regardless of which backend is currently in use.')); ?>  

----------------------Settings Controller--------------------------Translation don't display---------------------------PART. 02------------------------------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\Settings.php

#
#-----[ FIND line 34 ]------------------------------------------
#
  'This is where you configure global application settings.
  These settings apply regardless of which backend is currently in use.' => '',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'This is where you configure global application settings. These settings apply regardless of which backend is currently in use.' => '',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

----------------------User Controller--------------------------Translation don't display---------------------------PART. 01------------------------------------------

#
#-----[ OPEN ]------------------------------------------
#
C:\xampp\htdocs\xbmc-video-server\src\protected\views\user\admin.php

#
#-----[ FIND line 12 ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('User', 'This is where you configure users. Every user 
    has a role. Administrators can do anything while a normal user can only 
    switch backends (if more than one has been configured).')); ?>

#
#-----[ REPLACE WITH ]------------------------------------------
#
<?php echo FormHelper::helpBlock(Yii::t('User', 'This is where you configure users. Every user has a role. Administrators can do anything while a normal user can only switch backends (if more than one has been configured).')); ?>

----------------------User Controller--------------------------Translation don't display---------------------------PART. 02------------------------------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\User.php

#
#-----[ FIND line 27 ]------------------------------------------
#
  'This is where you configure users. Every user 
    has a role. Administrators can do anything while a normal user can only 
    switch backends (if more than one has been configured).' => '',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'This is where you configure users. Every user has a role. Administrators can do anything while a normal user can only switch backends (if more than one has been configured).' => '',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

To resume these fixes, it's required to put the texts who are on multiples lines on one line.

Galixte commented 10 years ago

During my work for the FRENCH translation I found many english words who are not available for translation :

C:\xampp\htdocs\xbmc-video-server\src\protected\helpers\ResultHelper.php

C:\xampp\htdocs\xbmc-video-server\src\protected\models\Log.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\videoLibrary\ _rating.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\movie\details.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\movie\recentlyAdded.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\tvShow_episodes.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\tvShow\details.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\tvShow\index.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\tvShow\recentlyAdded.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\setting\admin.php

C:\xampp\htdocs\xbmc-video-server\src\protected\views\user\admin.php

C:\xampp\htdocs\xbmc-video-server\src\protected\widgets\filter\VideoFilter.php

C:\xampp\htdocs\xbmc-video-server\vendor\yiisoft\yii\framework\zii\widgets\CBaseListView.php

C:\xampp\htdocs\xbmc-video-server\vendor\yiisoft\yii\framework\zii\widgets\grid\CButtonColumn.php

Jalle19 commented 10 years ago

Thanks for the list, I had no idea I had missed that many. I'll try to update the code later this week.

@Galixte do you have any suggestions on how the language should be changed? I would like it to be changeable from the interface since one of the selling points of this application is "no configuration files".Certainly a line in the configuration would be easier but...

Galixte commented 10 years ago

Maybe in a drop menu on the header .. i'm not exactly if i understand your question.

Jalle19 commented 10 years ago

@Galixte but that wouldn't be of any use on the login page. That's the main issue at the moment.

Galixte commented 10 years ago

And what about that ? When the user is on the login page, he find the choice for the language. And when the user is connected he find the language change in the menu Actions.

Jalle19 commented 10 years ago

Yeah that would work but it feels too complicated. I'll have to think about it a bit.

Jalle19 commented 10 years ago

@Galixte some changes I just made:

Since the translation-support branch has changed since you last checked it out you'll have to remove it before checking it out again:

git checkout master
git fetch origin
git branch -D translation-support
git checkout translation-support

After running those commands you'll have to follow the general update instructions from the README since the database has changed.

Notice that when you edit the translation files it's very important that you don't change anything on the left side of the => sign. That means you can't flatten a message on multiple lines into a single one.

Would be great if you could update the French translation so it gets complete, after that this branch can be merged!

Galixte commented 10 years ago

Ok thank you !

I'm on French translation, the new files.

why in : C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\TVShows.php I find this : 'Recently added movies' => '', Why this string about Movies is in a file about TV Show ?

Do you want to put instead ? 'Recently added episodes' => '',

If yes, the next string is not present in translation files ^_^ : 'Recently added movies' => '',

Jalle19 commented 10 years ago

@Galixte sorry about that, I pushed a fix now. There are a few other small updates to the translation file as well, I think I forgot to regenerate it earlier.

Galixte commented 10 years ago

Ok but with the fix about Update page of users and this missing about translation, what do i have to do about ?

Those strings ?

git checkout master git fetch origin git branch -D translation-support git checkout translation-support

Jalle19 commented 10 years ago

A simple git pull should be enough, if you get any errors you don't understand then run what you just wrote instead.

Galixte commented 10 years ago

Ok i have finished the FRENCH translation :)

I have noticed two things :

-----------A STRING OF TV SHOW'S PAGE IS NOT TRANSLATED-------------------

#
#-----[ OPEN ]------------------------------------------
#
C:\xampp\htdocs\xbmc-video-server\src\protected\views\tvShow\index.php

#
#-----[ FIND line 5 ]------------------------------------------
#
$this->pageTitle = $title = 'TV Shows';

#
#-----[ REPLACE WITH ]------------------------------------------
#
$this->pageTitle = $title = Yii::t('Menu', 'TV Shows');

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix

-----------A STRING OF TV SHOW'S PAGE IS NOT IN GOOD TRANSLATION FILE-------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\Login.php

#
#-----[ FIND lines 27-28 ]------------------------------------------
#
  'or choose individual episodes from the list below' => '',
);

#
#-----[ REPLACE WITH ]------------------------------------------
#
);

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr_FR WITH your_language
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr_FR\TVShows.php

#
#-----[ FIND line 19 ]------------------------------------------
#
return array (

#
#-----[ AFTER, ADD ]------------------------------------------
#
  'or choose individual episodes from the list below' => '',

#
#-----[ SAVE/CLOSE ALL FILES ]------------------------------------------
#
# End Of Fix
Galixte commented 10 years ago

.. and this two files are not translated :

C:\xampp\htdocs\xbmc-video-server\vendor\yiisoft\yii\framework\zii\widgets\CBaseListView.php

C:\xampp\htdocs\xbmc-video-server\vendor\yiisoft\yii\framework\zii\widgets\grid\CButtonColumn.php

Maybe it's difficult for you, but if you can it's better :=)

Jalle19 commented 10 years ago

@Galixte I'll push a fix later for the first things you mentioned, thanks for noticing. The stuff in your last post should be automatically translated since they're part of the framework code, I'll have a look why that's not the case.

Jalle19 commented 10 years ago

I think the underlying issue is that we use "fr_fr" for the French messages but it should be "fr" unless we're talking about a specific dialect like "fr_be". Like I said I'll push some changes later and you can have a new look.

Jalle19 commented 10 years ago

@Galixte could you send me your current translation? You can PM me on the XBMC forums.

Galixte commented 10 years ago

"@Galixte could you send me your current translation? You can PM me on the XBMC forums."

PM sent in XBMC forum.

Galixte commented 10 years ago

On translation branch the next message disappeared on details Movie's page (whatever the language) :

Click the Watch button to start streaming the video (open the file in your favorite media player), or download the individual files for later viewing using the links below it.

But on the master branch the message is good visible under the poster's image on details Movie's page.

Galixte commented 10 years ago

... two files again, they have some missing log translations :

C:\xampp\htdocs\xbmc-video-server\src\protected\controllers\SettingController.php

C:\xampp\htdocs\xbmc-video-server\src\protected\controllers\SiteController.php

Galixte commented 10 years ago

... and 4 files again, they have some missing log translations :

C:\xampp\htdocs\xbmc-video-server\src\protected\controllers\BackendController.php

C:\xampp\htdocs\xbmc-video-server\src\protected\controllers\UserController.php

C:\xampp\htdocs\xbmc-video-server\src\protected\widgets\RetrieveMovieWidget.php

C:\xampp\htdocs\xbmc-video-server\src\protected\widgets\RetrieveTVShowWidget.php

Galixte commented 10 years ago

Finally, my next message is still valid :

On the Settings page there are five descriptions options who are not translated while the French translation is enabled.

This concerns the following messages in the file :

C:\xampp\htdocs\xbmc-video-server\src\protected\models\Setting.php

The Posts are located here : 'description'=>Yii::t('Settings', 'You may have to right-click and copy the address in order to stream (not download) the file'), in line 162 'description'=>Yii::t('Settings', 'Useful on slow hardware. A refresh button will appear in the menu which flushes the cache'), in line 175 'description'=>Yii::t('Settings', 'Leave empty to disable pagination altogether'), in line 182 'description'=>Yii::t('Settings', 'When checked, streaming will be done over HTTPS if the application is accessed over HTTPS. This will usually only work if the server uses a real signed certificate, thus it is not enabled by default.'), in line 204 'description'=>Yii::t('Settings', "If specified, access is restricted to the defined whitelist. Valid values are IP addresses, IP subnets and domain names (including wildcards). Example: 192.168.1.0/24,1.2.3.4,example.com,*.user.com"), in line 214

Maybe the Element : description is the problem because if i test to replace the element : description with label like this :

'description'=>Yii::t('Settings', 'ENGLISH DESCRIPTION MESSAGE OPTIONS'),

replaced with :

'label'=>Yii::t('Settings', 'ENGLISH DESCRIPTION MESSAGE OPTIONS'),

The French translation works but il's not a good solution because it's a description message option and the message option disappears.

By opposition, the description messages of the option PROXY in the pages "Create new backend" and "Update Backend" are displayed in French translation.

Jalle19 commented 10 years ago

I've omitted the strings that are logged to the system log, I don't want to translate those since it makes debugging harder (if I ask someone to post a log and it's all in French I may not know what to do).

I'll have a look at the rest of the issues you mentioned, thanks!

Jalle19 commented 10 years ago

@Galixte I fixed the things you mentioned and changed the language to simply "fr" which means e.g. the "No results found" is now translated automatically. Do you mind going through the message files again to see if there's anything missing (there's one new message in the Settings category)?

Hopefully we'll get this whole thing merged soon!

Galixte commented 10 years ago

I have a look of your changes in FRENCH translation files, and i have found this :

-----------TWO IDENTICAL STRINGS IN TRANSLATION FILE OF LOG PAGE-------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr WITH yourlanguage
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr\Log.php

#
#-----[ FIND line 20 ]------------------------------------------
#
  'This is the system log. You can sort and 
    filter the table freely to find the information you need. To see the full 
    error message (in case it has been clipped), click the view icon on the 
    right. You can also flush the log by pressing the <i>Flush logs</i> 
    button.' => '',
  'This is the system log. You can sort and 
    filter the table freely to find the information you need. To see the full 
    error message (in case it has been clipped), click the view icon on the 
    right. You can also flush the log by pressing the <i>Flush logs</i> 
    button.' => '@@Voici l\'historique de l\'application. Pour y trouver l\'information recherchée vous pouvez trier et filtrer l\'affichage du tableau situé ci-dessous. Pour lire le message d\'erreur complet, cliquez sur l\'icône associé situé à droite. Vous pouvez aussi effacer entièrement l\'historique en cliquant sur le bouton <i>Effacer l\'historique</i>.@@',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'This is the system log. You can sort and 
    filter the table freely to find the information you need. To see the full 
    error message (in case it has been clipped), click the view icon on the 
    right. You can also flush the log by pressing the <i>Flush logs</i> 
    button.' => 'Voici l\'historique de l\'application. Pour y trouver l\'information recherchée vous pouvez trier et filtrer l\'affichage du tableau situé ci-dessous. Pour lire le message d\'erreur complet, cliquez sur l\'icône associé situé à droite. Vous pouvez aussi effacer entièrement l\'historique en cliquant sur le bouton <i>Effacer l\'historique</i>.',   

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix
Jalle19 commented 10 years ago

Yeah that was by accident, you can remove the @@.

Galixte commented 10 years ago

same mistake in other file :

-----------TWO IDENTICAL STRINGS IN TRANSLATION FILE OF MOVIES DETAILS PAGE-------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr WITH yourlanguage
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr\Movies.php

#
#-----[ FIND line 20 ]------------------------------------------
#
  'Click the Watch button to start streaming the video (open 
                        the file in your favorite media player), or download the 
                        individual files for later viewing using the links below it.' => '',
  'Click the Watch button to start streaming the video (open 
                        the file in your favorite media player), or download the 
                        individual files for later viewing using the links below it.' => '@@Pour lancer le streaming cliquez sur le bouton Voir un fichier à télécharger au format M3U vous sera proposé (l\'ouvrir avec le logiciel VLC). Vous pouvez aussi télécharger le film pour le voir plus tard en cliquant sur le lien Télécharger.@@',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'Click the Watch button to start streaming the video (open 
                        the file in your favorite media player), or download the 
                        individual files for later viewing using the links below it.' => 'Pour lancer le streaming cliquez sur le bouton Voir un fichier à télécharger au format M3U vous sera proposé (l\'ouvrir avec le logiciel VLC). Vous pouvez aussi télécharger le film pour le voir plus tard en cliquant sur le lien Télécharger.',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix
Galixte commented 10 years ago

ok I fix it all

Galixte commented 10 years ago

i prefer notice all modifications to keep a track (french expression), a same mistake in other file :

-----------TWO IDENTICAL STRINGS IN TRANSLATION FILE OF USER PAGE-------------------

#
#-----[ OPEN ]------------------------------------------
# REPLACE fr WITH yourlanguage
C:\xampp\htdocs\xbmc-video-server\src\protected\messages\fr\User.php

#
#-----[ FIND line 20 ]------------------------------------------
#
  'This is where you configure users. Every user 
    has a role. Administrators can do anything while a normal user can only 
    switch backends (if more than one has been configured).' => '',
  'This is where you configure users. Every user 
    has a role. Administrators can do anything while a normal user can only 
    switch backends (if more than one has been configured).' => '@@Voici la gestion des utilisateurs. Chaque utilisateur a un rôle. Les administrateurs ont tous les pouvoirs alors qu\'un utilisateur peut seulement passer d\'une source à l\'autre (si plus d\'une source a été configurée).@@',

#
#-----[ REPLACE WITH ]------------------------------------------
#
  'This is where you configure users. Every user 
    has a role. Administrators can do anything while a normal user can only 
    switch backends (if more than one has been configured).' => 'Voici la gestion des utilisateurs. Chaque utilisateur a un rôle. Les administrateurs ont tous les pouvoirs alors qu\'un utilisateur peut seulement passer d\'une source à l\'autre (si plus d\'une source a été configurée).',

#
#-----[ SAVE/CLOSE THE FILE ]------------------------------------------
#
# End Of Fix
Jalle19 commented 10 years ago

I was certain I had fixed all those duplicates in the last update, oh well.

Galixte commented 10 years ago

PM sent in XBMC forum for the new update of French translation.

Jalle19 commented 10 years ago

Thanks, I'll integrate it into this branch as soon as possible! After that I think I'll rebase the branch to reduce the number of commits and then merge it into master. I'll just have to add some information regarding how to contribute new translations in the future.

Galixte commented 10 years ago

Yes thanks ! For me the french translation is fully functional and my users will be satisfied.

Jalle19 commented 10 years ago

@Galixte mind trying the translation-support branch out one last time? I've squashed a lot of the commits into one so you'll need to delete the branch and checkout it again like before. If the translations still look okay to you I'll merge it tomorrow or something.

Galixte commented 10 years ago

It's OK for translation you can merge, thanks !

Jalle19 commented 10 years ago

Translation support is now included in the master branch so I'm closing this. See CONTRIBUTING.md for information on how to contribute new translations in the future.