cms/sources.py - Issue 29317015: Issue 2625 - [cms] Crowdin synchronisation script

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: cms/sources.py

Issue 29317015: Issue 2625 - [cms] Crowdin synchronisation script (Closed)

Patch Set: Addressed Sebastian's feedback Created July 14, 2015, 12:50 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: cms/sources.py

diff --git a/cms/sources.py b/cms/sources.py

index 51770027059033470ef3652bb0756ee44370f217..ae4ce7575573c764d965fd027c32c04e7af60904 100644

--- a/cms/sources.py

+++ b/cms/sources.py

@@ -16,6 +16,7 @@

# along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

import codecs

+import collections

import ConfigParser

import json

import os

@@ -168,10 +169,9 @@ class Source:

def read_locale(self, locale, page):

default_locale = self.read_config().get("general", "defaultlocale")

- if locale == default_locale:

- result = {}

- else:

- result = dict(self.read_locale(default_locale, page))

+ result = collections.OrderedDict()

+ if locale != default_locale:

+ result.update(self.read_locale(default_locale, page))

if self.has_locale(locale, page):

filedata = self.read_file(self.locale_filename(locale, page))

« cms/bin/translate.py ('K') | « cms/converters.py ('k') | cms/utils.py » ('j') | no next file with comments »