Skip to content

Commit

Permalink
Updated dependencies and fixed some build issues
Browse files Browse the repository at this point in the history 
@m-e-conroy I got rid of the src/dialogs because it was confusing and
causing people to do pull requests on that single file. It should only
be in the dist folder.
  • Loading branch information
@niemyjski
niemyjski committed Feb 24, 2016
1 parent 5847734 commit f9869d4
Show file tree
Hide file tree
Showing 12 changed files with 161 additions and 691 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
bower_components
.idea
temp
8 changes: 4 additions & 4 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
"README.md"
],
"dependencies": {
"bootstrap": "~3.3.5",
"angular": "^1.5",
"angular-sanitize": "^1.5",
"bootstrap": "~3.3.6",
"angular": "^1.5.0",
"angular-sanitize": "^1.5.0",
"angular-bootstrap": "^1.1.2",
"angular-translate": "^2.4"
"angular-translate": "^2.9.2"
},
"main": [
"dist/dialogs.css",
Expand Down
113 changes: 65 additions & 48 deletions dist/dialogs-default-translations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,23 @@
* $translateProvider.preferredLanguage('[lang]');
*/
.config(['$translateProvider',function($translateProvider){
$translateProvider.translations('de-DE',{
DIALOGS_ERROR: "Error",
DIALOGS_ERROR_MSG: "Ein unbekannter Fehler ist aufgetreten.",
DIALOGS_CLOSE: "Schließen",
DIALOGS_PLEASE_WAIT: "Bitte warten",
DIALOGS_PLEASE_WAIT_ELIPS: "Bitte warten...",
DIALOGS_PLEASE_WAIT_MSG: "Warte auf Fertigstellung der Operation.",
DIALOGS_PERCENT_COMPLETE: "% fertig",
DIALOGS_NOTIFICATION: "Benachrichtigung",
DIALOGS_NOTIFICATION_MSG: "Unbekannte Anwendungsbenachrichtigung.",
DIALOGS_CONFIRMATION: "Bestätigung",
DIALOGS_CONFIRMATION_MSG: "Bestätigung erforderlich.",
DIALOGS_OK: "OK",
DIALOGS_YES: "Ja",
DIALOGS_NO: "Nein"
});

$translateProvider.translations('en-US',{
DIALOGS_ERROR: "Error",
DIALOGS_ERROR_MSG: "An unknown error has occurred.",
Expand All @@ -51,58 +68,41 @@
DIALOGS_YES: "Yes",
DIALOGS_NO: "No"
});

$translateProvider.translations('zh-CN',{
DIALOGS_ERROR: "错误",
DIALOGS_ERROR_MSG: "出现未知错误。",
DIALOGS_CLOSE: "关闭",
DIALOGS_PLEASE_WAIT: "请稍候",
DIALOGS_PLEASE_WAIT_ELIPS: "请稍候...",
DIALOGS_PLEASE_WAIT_MSG: "请等待操作完成。",
DIALOGS_PERCENT_COMPLETE: "% 已完成",
DIALOGS_NOTIFICATION: "通知",
DIALOGS_NOTIFICATION_MSG: "未知应用程序的通知。",
DIALOGS_CONFIRMATION: "确认",
DIALOGS_CONFIRMATION_MSG: "确认要求。",
DIALOGS_OK: "确定",
DIALOGS_YES: "确认",
DIALOGS_NO: "取消"
});


$translateProvider.translations('es-ES',{
DIALOGS_ERROR: "Error",
DIALOGS_ERROR_MSG: "Se ha producido un error.",
DIALOGS_CLOSE: "Cerrar",
DIALOGS_PLEASE_WAIT: "Espere por favor",
DIALOGS_PLEASE_WAIT_ELIPS: "Espere por favor...",
DIALOGS_PLEASE_WAIT_MSG: "Completando operación.",
DIALOGS_PERCENT_COMPLETE: "% Completado",
DIALOGS_NOTIFICATION: "Notificación",
DIALOGS_NOTIFICATION_MSG: "Notificación de una aplicación desconocida.",
DIALOGS_CONFIRMATION: "Confirmación",
DIALOGS_CONFIRMATION_MSG: "Se requiere confirmacion.",
DIALOGS_OK: "Aceptar",
DIALOGS_YES: "Sí",
DIALOGS_NO: "No"
DIALOGS_ERROR: "Error",
DIALOGS_ERROR_MSG: "Se ha producido un error.",
DIALOGS_CLOSE: "Cerrar",
DIALOGS_PLEASE_WAIT: "Espere por favor",
DIALOGS_PLEASE_WAIT_ELIPS: "Espere por favor...",
DIALOGS_PLEASE_WAIT_MSG: "Completando operación.",
DIALOGS_PERCENT_COMPLETE: "% Completado",
DIALOGS_NOTIFICATION: "Notificación",
DIALOGS_NOTIFICATION_MSG: "Notificación de una aplicación desconocida.",
DIALOGS_CONFIRMATION: "Confirmación",
DIALOGS_CONFIRMATION_MSG: "Se requiere confirmacion.",
DIALOGS_OK: "Aceptar",
DIALOGS_YES: "Sí",
DIALOGS_NO: "No"
});

$translateProvider.translations("fr-FR", {
DIALOGS_ERROR: "Erreur",
DIALOGS_ERROR_MSG: "Une erreur inconnue s'est produite.",
DIALOGS_CLOSE: "Fermer",
DIALOGS_PLEASE_WAIT: "Patientez svp",
DIALOGS_PLEASE_WAIT_ELIPS: "Patienter svp...",
DIALOGS_PLEASE_WAIT_MSG: "En attente de la fin de l'opération.",
DIALOGS_PERCENT_COMPLETE: "% Terminer",
DIALOGS_NOTIFICATION: "Notification",
DIALOGS_NOTIFICATION_MSG: "Notification de l'application inconnue",
DIALOGS_CONFIRMATION: "Confirmer",
DIALOGS_CONFIRMATION_MSG: "Merci de confirmer",
DIALOGS_OK: "OK",
DIALOGS_YES: "Oui",
DIALOGS_NO: "Non"
DIALOGS_ERROR: "Erreur",
DIALOGS_ERROR_MSG: "Une erreur inconnue s'est produite.",
DIALOGS_CLOSE: "Fermer",
DIALOGS_PLEASE_WAIT: "Patientez svp",
DIALOGS_PLEASE_WAIT_ELIPS: "Patienter svp...",
DIALOGS_PLEASE_WAIT_MSG: "En attente de la fin de l'opération.",
DIALOGS_PERCENT_COMPLETE: "% Terminer",
DIALOGS_NOTIFICATION: "Notification",
DIALOGS_NOTIFICATION_MSG: "Notification de l'application inconnue",
DIALOGS_CONFIRMATION: "Confirmer",
DIALOGS_CONFIRMATION_MSG: "Merci de confirmer",
DIALOGS_OK: "OK",
DIALOGS_YES: "Oui",
DIALOGS_NO: "Non"
});

$translateProvider.translations('pt-BR',{
DIALOGS_ERROR: "Erro",
DIALOGS_ERROR_MSG: "Ocorreu um erro inesperado.",
Expand All @@ -120,5 +120,22 @@
DIALOGS_NO: "Não"
});

$translateProvider.translations('zh-CN',{
DIALOGS_ERROR: "错误",
DIALOGS_ERROR_MSG: "出现未知错误。",
DIALOGS_CLOSE: "关闭",
DIALOGS_PLEASE_WAIT: "请稍候",
DIALOGS_PLEASE_WAIT_ELIPS: "请稍候...",
DIALOGS_PLEASE_WAIT_MSG: "请等待操作完成。",
DIALOGS_PERCENT_COMPLETE: "% 已完成",
DIALOGS_NOTIFICATION: "通知",
DIALOGS_NOTIFICATION_MSG: "未知应用程序的通知。",
DIALOGS_CONFIRMATION: "确认",
DIALOGS_CONFIRMATION_MSG: "确认要求。",
DIALOGS_OK: "确定",
DIALOGS_YES: "确认",
DIALOGS_NO: "取消"
});

$translateProvider.preferredLanguage('en-US');
}]); // end config
2 changes: 1 addition & 1 deletion dist/dialogs-default-translations.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/dialogs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ angular.module('dialogs.main',['dialogs.services','ngSanitize']) // requires ang
// try to find css rule .fa, in case style sheet has been concatenated
_rules = _sheets[i].cssRules;
for(var x = (_rules.length - 1);x >= 0;x--){
if(_rules[x].selectorText.toLowerCase() == '.fa'){
if(typeof(_rules[x].selectorText) === 'string' && _rules[x].selectorText.toLowerCase() === '.fa'){
dialogsProvider.useFontAwesome();
break sheetLoop; // done, exit both for loops
}
Expand Down
Loading

1 comment on commit f9869d4

@m-e-conroy
Copy link
Owner

@m-e-conroy m-e-conroy commented on f9869d4 Feb 29, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.