taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[l18n] More minor fixes

stable
David Barragán Merino 2015-04-17 13:32:05 +02:00
parent d14c17a956
commit 24379ed235
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/coffee/app.coffee
View File

@ -200,9 +200,8 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
$httpProvider.interceptors.push('authHttpIntercept') $httpProvider.interceptors.push('authHttpIntercept')
# If there is an error in the version throw a notify error # If there is an error in the version throw a notify error
versionCheckHttpIntercept = ($q, $confirm) -> versionCheckHttpIntercept = ($q, $confirm, $translate) ->
versionErrorMsg = "Someone inside Taiga has changed this before and our Oompa Loompas cannot apply your changes. versionErrorMsg = $translate.instant("ERROR.VERSION_ERROR")
Please reload and apply your changes again (they will be lost)." #TODO: i18n
httpResponseError = (response) -> httpResponseError = (response) ->
if response.status == 400 && response.data.version if response.status == 400 && response.data.version
@ -216,9 +215,9 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
responseError: httpResponseError responseError: httpResponseError
} }
$provide.factory("versionCheckHttpIntercept", ["$q", "$tgConfirm", versionCheckHttpIntercept]) $provide.factory("versionCheckHttpIntercept", ["$q", "$tgConfirm", "$translate", versionCheckHttpIntercept])
$httpProvider.interceptors.push('versionCheckHttpIntercept'); $httpProvider.interceptors.push('versionCheckHttpIntercept')
window.checksley.updateValidators({ window.checksley.updateValidators({
linewidth: (val, width) -> linewidth: (val, width) ->
@ -230,10 +229,6 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
return valid return valid
}) })
window.checksley.updateMessages("default", {
linewidth: "The subject must have a maximum size of %s"
})
$compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false) $compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false)
$translateProvider.useStaticFilesLoader({ $translateProvider.useStaticFilesLoader({
@ -258,7 +253,6 @@ init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->
$analytics.initialize() $analytics.initialize()
modules = [ modules = [
# Main Global Modules # Main Global Modules
"taigaBase", "taigaBase",

3
app/locales/locale-en.json
View File

@ -582,7 +582,8 @@
"NOT_FOUND": "Not found", "NOT_FOUND": "Not found",
"NOT_FOUND_TEXT": "Error 404. The page you are looking for no longer exists. Perhaps you can return back to TAIGA homepage and see if you can find what you are looking for.", "NOT_FOUND_TEXT": "Error 404. The page you are looking for no longer exists. Perhaps you can return back to TAIGA homepage and see if you can find what you are looking for.",
"PERMISSION_DENIED": "Permission denied", "PERMISSION_DENIED": "Permission denied",
"PERMISSION_DENIED_CODE": "Error 403." "PERMISSION_DENIED_CODE": "Error 403.",
"VERSION_ERROR": "Someone inside Taiga has changed this before and our Oompa Loompas cannot apply your changes. Please reload and apply your changes again (they will be lost)."
}, },
"TASKBOARD": { "TASKBOARD": {
"SECTION_NAME": "Taskboard", "SECTION_NAME": "Taskboard",

2
app/partials/admin/admin-third-parties-github.jade
View File

@ -25,7 +25,7 @@ div.wrapper.roles(tg-github-webhooks, ng-controller="GithubController as ctrl",
.icon.icon-copy .icon.icon-copy
.help-copy(translate="COMMON.COPY_TO_CLIPBOARD") .help-copy(translate="COMMON.COPY_TO_CLIPBOARD")
button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}") button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE")
a.help-button(href="https://taiga.io/support/github-integration/", target="_blank") a.help-button(href="https://taiga.io/support/github-integration/", target="_blank")
span.icon.icon-help span.icon.icon-help