Hi Drupal translators,
I recently have created the new structure/files for Romanian D6 translation. I have created the new .po files (http://drupal.org/node/11311) and I have build the directory structure and move the files to that directories (using the modified build.php found in HU translation). Now my D6 translation directories/files look like this:
ro/ modules/ aggregator/ translations/ modules-aggregator.ro.po block/ [...] profiles/ [...] themes/ [...]
I have committed successful this structure to CVS. You can find it at http://cvs.drupal.org/viewvc.py/drupal/contributions/translations/ro/.
I added a new branch DRUPAL-6--1 needed for development snaphost releases and create the dev release. The new release ro-6.x-1.x-dev.tar.gz was created (see: http://drupal.org/node/221670) even if is not displayed on project page (no official release is published yet!).
And now... guess what? I downloaded the release (http://ftp.drupal.org/files/projects/ro-6.x-1.x-dev.tar.gz) and I open it. I found differences between what I have committed and what is in the tar.gz file:
* I found in the release (in the root) two new files: LICENSE.ro.txt and STATUS.ro.txt which I had never committed.
* The ro/modules/system/ directory structure is different. Mine is
ro/modules/system/translations/ general.ro.po includes.ro.po misc.ro.po modules-system.ro.po
... and what I found in the .tar.gz file is like:
ro/ aggregator/ module/ translations/ aggregator-module.ro.po [...] system/ module/ translations/ system-module.ro.po install/ translations/ system-install.ro.po [...]
No other comitters were comitted to CVS... see: http://drupal.org/project/cvs/11490
Can this be explained?
Thank you! Claudiu
On 17 feb 2008, at 11:04, Claudiu Cristea wrote:
Hi Drupal translators,
I recently have created the new structure/files for Romanian D6 translation. I have created the new .po files (http://drupal.org/node/11311) and I have build the directory structure and move the files to that directories (using the modified build.php found in HU translation). Now my D6 translation directories/files look like this:
ro/ modules/ aggregator/ translations/ modules-aggregator.ro.po block/ [...] profiles/ [...] themes/ [...]
I have committed successful this structure to CVS. You can find it at http://cvs.drupal.org/viewvc.py/drupal/contributions/translations/ro/.
The translation files should be committed in a flat format to CVS. For examples you can have a look at other translations such as hu, nl, fr. Make sure you look at the DRUPAL-6--1 tagged versions.
I added a new branch DRUPAL-6--1 needed for development snaphost releases and create the dev release. The new release ro-6.x-1.x-dev.tar.gz was created (see: http://drupal.org/node/221670) even if is not displayed on project page (no official release is published yet!).
A development snapshot (6.x-1.x-dev) is created automatically by a batch job which runs every 12 hours.
And now... guess what? I downloaded the release (http://ftp.drupal.org/files/projects/ro-6.x-1.x-dev.tar.gz) and I open it. I found differences between what I have committed and what is in the tar.gz file:
- I found in the release (in the root) two new files: LICENSE.ro.txt
and STATUS.ro.txt which I had never committed.
These files are added automtically. You don't need to commit them and should not.
- The ro/modules/system/ directory structure is different. Mine is
ro/modules/system/translations/ general.ro.po includes.ro.po misc.ro.po modules-system.ro.po
... and what I found in the .tar.gz file is like:
ro/ aggregator/ module/ translations/ aggregator-module.ro.po [...] system/ module/ translations/ system-module.ro.po install/ translations/ system-install.ro.po [...]
This seems like a perfectly normal structure. In the README in the POT tarball (http://ftp.drupal.org/files/projects/drupal- pot-6.x-1.0.tar.gz) the structure is described.
No other comitters were comitted to CVS... see: http://drupal.org/project/cvs/11490
Can this be explained?
Thank you! Claudiu
Regards, Erik Stielstra
The translation files should be committed in a flat format to CVS. For examples you can have a look at other translations such as hu, nl, fr. Make sure you look at the DRUPAL-6--1 tagged versions.
Didn't know this... Now I added the flat structure... but the old directories are still there (modules/, profiles/ and thrmes/). I cannot figure out how to delete them... Also I cannot mark the these new comitted files as branch DRUPAL-6--1.
Sure I miss somethig on working with CVS...
Can anybody help me to fix this?
Thank you! Claudiu C.
On Feb 17, 2008 8:56 PM, Claudiu Cristea clau.cristea@gmail.com wrote:
The translation files should be committed in a flat format to CVS. For examples you can have a look at other translations such as hu, nl, fr. Make sure you look at the DRUPAL-6--1 tagged versions.
Didn't know this... Now I added the flat structure... but the old directories are still there (modules/, profiles/ and thrmes/).
CVS keeps all directories you ever committed :) On checkout, if you use the -P option, empty directories are deleted in your checkout (but never on the server).
I cannot figure out how to delete them... Also I cannot mark the these new comitted files as branch DRUPAL-6--1.
What's the error message?
Gabor
On Feb 18, 2008 11:31 AM, Claudiu Cristea clau.cristea@gmail.com wrote:
Thank you Gábor,
What's the error message?
I get this error for all files: W general.ro.po : DRUPAL-6--1 already exists on branch 1.1 : NOT MOVING tag to branch 1.1.0.4
What have I done wrong? I'm a little bit "unsteady" with CVS..
Well, since it already, exists, tell CVS to move it. Use the -F option (check out the help):
$ cvs --help tag Usage: cvs tag [-bcdFflR] [-r rev|-D date] tag [files...] -b Make the tag a "branch" tag, allowing concurrent development. -B Allows -F and -d to disturb branch tags. Use with extreme care. -c Check that working files are unmodified. -d Delete the given tag. -F Move tag if it already exists. -f Force a head revision match if tag/date not found. -l Local directory only, not recursive. -R Process directories recursively. -r rev Existing revision/tag. -D Existing date. (Specify the --help global option for a list of other help options)
Gabor
-
Claudiu Cristea -
Erik Stielstra -
Gábor Hojtsy