Skip to content
This repository
Browse code

Docs about merging back translations

  • Loading branch information...
commit d45b33e9c797208f41805127cf5661feac375904 1 parent d0faad1
Ingo Schommer authored July 13, 2012

Showing 1 changed file with 19 additions and 2 deletions. Show diff stats Hide diff stats

  1. 21  docs/en/misc/translation-process.md
21  docs/en/misc/translation-process.md
Source Rendered
@@ -88,6 +88,23 @@ and merge it back manually to your 'master' as required.
88 88
 	cp build.properties # Add your own getlocalization config to 'build.properties'
89 89
 	phing -Dmodule=<yourmodule> -propertyfile build.properties translations-sync
90 90
 
  91
+### Merge back existing translations
  92
+
  93
+Since the latest translations are downloaded into a "translations-staging"
  94
+branch, you need to get them back into your main project repository.
  95
+This depends on your release strategy: For simpler modules,
  96
+just merge back to master:
  97
+
  98
+	git checkout master
  99
+	git merge translations-staging
  100
+
  101
+In case you are maintaining release branches, its a bit more complicated:
  102
+The "translations-staging" branch is (correctly) based off master,
  103
+but you don't want to merge all other master changes into your release branch.
  104
+Use the following task to copy & commit the specific files instead:
  105
+
  106
+	phing -Dmodule=<yourmodule> translations-mergeback
  107
+
91 108
 ### Converting your language files from 2.4 PHP format
92 109
 
93 110
 The conversion from PHP format to YML is taken care of by a module
@@ -107,9 +124,9 @@ Special characters (such as german umlauts) need to be entered in their native f
107 124
 
108 125
 Currently translated entities are not directly factored into code (for security reasons and release/review-control), so you can't see them straight away. 
109 126
 
110  
-
111 127
 It is strongly encouraged that you check your translation this way, as its a good way to doublecheck your translation works in the right context.
112  
-Please use our [daily-builds](http://www.silverstripe.org/daily-builds/) for your local installation, to ensure you're looking at the most up to date interface.
  128
+Please use our [daily-builds](http://www.silverstripe.org/daily-builds/) for your local installation, to ensure you're looking at the most up to date interface. See "Download Translations" above
  129
+to find out how to retrieve the latest translation files.
113 130
 
114 131
 ### Can I change a translation just for one SilverStripe version?
115 132
 

0 notes on commit d45b33e

Please sign in to comment.
Something went wrong with that request. Please try again.