Merge branch 'develop' into yaco

mbi · Mar 19, 2014 · 1c4e8b1 · 1c4e8b1
2 parents 0c3d722 + fd56c2e
commit 1c4e8b1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/rosetta/views.py b/rosetta/views.py
@@ -55,6 +55,7 @@ def fix_nls(in_, out_):
 
  storage = get_storage(request)
  version = rosetta.get_version(True)
+ query_arg = ''
  if storage.has('rosetta_i18n_fn'):
  rosetta_i18n_fn = storage.get('rosetta_i18n_fn')
  rosetta_i18n_app = get_app_name(rosetta_i18n_fn)
@@ -177,7 +178,6 @@ def fix_nls(in_, out_):
  except:
  storage.set('rosetta_i18n_write', False)
  storage.set('rosetta_i18n_pofile', rosetta_i18n_pofile)
-
  # Retain query arguments
  query_arg = '?_next=1'
  if 'query' in request.GET or 'query' in request.POST:
@@ -187,7 +187,7 @@ def fix_nls(in_, out_):
  return HttpResponseRedirect(reverse('rosetta-home') + iri_to_uri(query_arg))
  rosetta_i18n_lang_name = _(storage.get('rosetta_i18n_lang_name'))
  rosetta_i18n_lang_code = storage.get('rosetta_i18n_lang_code')
-
+ query_arg = '?' + request.GET.urlencode()
  if 'query' in request.REQUEST and request.REQUEST.get('query', '').strip():
  query = request.REQUEST.get('query').strip()
  rx = re.compile(re.escape(query), re.IGNORECASE)
@@ -201,7 +201,6 @@ def fix_nls(in_, out_):
  paginator = Paginator([e for e in rosetta_i18n_pofile.fuzzy_entries() if not e.obsolete], rosetta_settings.MESSAGES_PER_PAGE)
  else:
  paginator = Paginator([e for e in rosetta_i18n_pofile if not e.obsolete], rosetta_settings.MESSAGES_PER_PAGE)
-
  if 'page' in request.GET and int(request.GET.get('page')) <= paginator.num_pages and int(request.GET.get('page')) > 0:
  page = int(request.GET.get('page'))
  else:
@@ -507,7 +506,9 @@ def lang_sel(request, langid, idx):
  except OSError:
  storage.set('rosetta_i18n_write', False)
 
- return HttpResponseRedirect(reverse('rosetta-home'))
+ query_arg = '?'
+ query_arg += request.GET.urlencode()
+ return HttpResponseRedirect(reverse('rosetta-home') + query_arg)
 lang_sel = never_cache(lang_sel)
 lang_sel = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(lang_sel)