Skip to content

Commit

Permalink
Merge branch 'master' into newest-version
Browse files Browse the repository at this point in the history
  • Loading branch information
delaine-eb authored May 8, 2019
2 parents 90f5a06 + 89044d3 commit e8c6cab
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions src/shuttle/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import babel.messages.pofile
from deskapi.models import DeskApi2
from django.conf import settings
import txlib.api.statistics
import txlib.api.translations
from txlib.http.exceptions import NotFoundError
import txlib_too.api.statistics
import txlib_too.api.translations
from txlib_too.http.exceptions import NotFoundError

from transifex import Tx

Expand Down Expand Up @@ -216,7 +216,7 @@ def push(self):
def pull(self):
"""Pull topics from Transifex."""

topic_stats = txlib.api.statistics.Statistics.get(
topic_stats = txlib_too.api.statistics.Statistics.get(
project_slug=self.tx_project_slug,
resource_slug=self.TOPIC_STRINGS_SLUG,
)
Expand All @@ -237,7 +237,7 @@ def pull(self):

if locale_stats['completed'] == '100%':
# get the resource from Tx
translation = txlib.api.translations.Translation.get(
translation = txlib_too.api.translations.Translation.get(
project_slug=self.tx_project_slug,
slug=self.TOPIC_STRINGS_SLUG,
lang=locale,
Expand Down
11 changes: 6 additions & 5 deletions src/shuttle/transifex.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from django.conf import settings
from txlib import registry
from txlib.http import auth
from txlib.http.exceptions import NotFoundError, RemoteServerError
from txlib.http import http_requests
from txlib.api import (
from txlib_too import registry
from txlib_too.http import auth
from txlib_too.http.exceptions import NotFoundError, RemoteServerError
from txlib_too.http import http_requests
from txlib_too.api import (
project,
resources,
translations,
Expand All @@ -16,6 +16,7 @@
DEFAULT_SOURCE_LANGUAGE = 'en_US'
DEFAULT_I18N_TYPE = 'HTML'


class Tx(object):

def __init__(self, project_slug_prefix):
Expand Down

0 comments on commit e8c6cab

Please sign in to comment.