Skip to content

Commit

Permalink
ORA-680 improve delete program in list, add some more messages from s…
Browse files Browse the repository at this point in the history
…erver
  • Loading branch information
bjost2s committed Sep 23, 2015
1 parent fcb0a5b commit 9d9a5da
Show file tree
Hide file tree
Showing 15 changed files with 144 additions and 91 deletions.
30 changes: 15 additions & 15 deletions OpenRobertaServer/staticResources/blockly/blockly_compressed.js

Large diffs are not rendered by default.

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

3 changes: 2 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/js/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,11 @@ Blockly.Msg.ORA_PROGRAM_GET_ALL_SUCCESS = "Programmer åbnet";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_FOUND = "Program ikke fundet.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_LOGGED_IN = "Bruger ikke logget ind.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_SUCCESS = "Program åbnet";
Blockly.Msg.ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS = "This program already exists."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB = "Kunne ikke gemme program.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND = "An error has occured while updating the program."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION = "You do not have the permission to modify this program!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING = "This program is already locked!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND = "The program could not be found, so it is impossible to update it."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_SUCCESS = "Program gemt";
Blockly.Msg.ORA_PROGRAM_TO_SHARE_DOES_NOT_EXIST = "Det program der skulle deles kunne ikke findes.";
Blockly.Msg.ORA_ROBOT_FIRMWAREUPDATE_IMPOSSIBLE = "Firmwaren kunne ikke opdateres.";
Expand Down
3 changes: 2 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/js/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,11 @@ Blockly.Msg.ORA_PROGRAM_GET_ALL_SUCCESS = "Du hast deine Programme geladen.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_FOUND = "Das Programm konnte nicht in der Datenbank gefunden werden.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_LOGGED_IN = "Du bist nicht angemeldet, bitte melde dich mit deinem Benutzernamen und dem Passwort an oder erstelle dir ein neues Benutzerkonto.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_SUCCESS = "Du hast das Programm $ geladen.";
Blockly.Msg.ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS = "Dieses Programm existiert bereits.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB = "Ein Fehler ist beim Speichern des Programmes aufgetreten.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND = "An error has occured while updating the program."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION = "You do not have the permission to modify this program!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING = "This program is already locked!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND = "Das Programm konnte nicht gefunden werden, ein Update ist unmöglich.";
Blockly.Msg.ORA_PROGRAM_SAVE_SUCCESS = "Das Programm $ wurde gespeichert.";
Blockly.Msg.ORA_PROGRAM_TO_SHARE_DOES_NOT_EXIST = "Das Programm $, das du teilen möchtest, gibt es leider nicht.";
Blockly.Msg.ORA_ROBOT_FIRMWAREUPDATE_IMPOSSIBLE = "Ein Fehler ist beim Herunterladen des neuen Systems für deinen Roboter aufgetreten.";
Expand Down
3 changes: 2 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/js/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,11 @@ Blockly.Msg.ORA_PROGRAM_GET_ALL_SUCCESS = "Programs loaded";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_FOUND = "Program not found.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_LOGGED_IN = "You are not logged in, please log in with your username and password or create a new user.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_SUCCESS = "Program loaded";
Blockly.Msg.ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS = "This program already exists.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB = "An error has occured while saving the program.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND = "An error has occured while updating the program.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION = "You do not have the permission to modify this program!";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING = "This program is already locked!";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND = "The program could not be found, so it is impossible to update it.";
Blockly.Msg.ORA_PROGRAM_SAVE_SUCCESS = "Program saved";
Blockly.Msg.ORA_PROGRAM_TO_SHARE_DOES_NOT_EXIST = "The program that you would like to share does not exist.";
Blockly.Msg.ORA_ROBOT_FIRMWAREUPDATE_IMPOSSIBLE = "An error has occured while updating the new firmware on your robot.";
Expand Down
3 changes: 2 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/js/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,11 @@ Blockly.Msg.ORA_PROGRAM_GET_ALL_SUCCESS = "Programa cargado.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_FOUND = "No se encontró el programa en la base de datos.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_LOGGED_IN = "No has iniciado sesión. Por favor inicia sesión con tu nombre de usuario y contraseña o crea un nuevo usuario";
Blockly.Msg.ORA_PROGRAM_GET_ONE_SUCCESS = "Programa cargado.";
Blockly.Msg.ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS = "This program already exists."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB = "Error al guardar el programa.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND = "An error has occured while updating the program."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION = "You do not have the permission to modify this program!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING = "This program is already locked!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND = "The program could not be found, so it is impossible to update it."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_SUCCESS = "Programa guardado.";
Blockly.Msg.ORA_PROGRAM_TO_SHARE_DOES_NOT_EXIST = "El programa que quieres compartir no existe.";
Blockly.Msg.ORA_ROBOT_FIRMWAREUPDATE_IMPOSSIBLE = "Ha ocurrido un error al actualizar el firmware de tu robot.";
Expand Down
3 changes: 2 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/js/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,11 @@ Blockly.Msg.ORA_PROGRAM_GET_ALL_SUCCESS = "Programs loaded";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_FOUND = "Program not found.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_LOGGED_IN = "User not logged in.";
Blockly.Msg.ORA_PROGRAM_GET_ONE_SUCCESS = "Program loaded";
Blockly.Msg.ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS = "This program already exists."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB = "Error while saving the program.";
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND = "An error has occured while updating the program."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION = "You do not have the permission to modify this program!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING = "This program is already locked!"; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND = "The program could not be found, so it is impossible to update it."; // untranslated
Blockly.Msg.ORA_PROGRAM_SAVE_SUCCESS = "Program saved";
Blockly.Msg.ORA_PROGRAM_TO_SHARE_DOES_NOT_EXIST = "Program to share does not exist.";
Blockly.Msg.ORA_ROBOT_FIRMWAREUPDATE_IMPOSSIBLE = "The firmware could not be updated.";
Expand Down
3 changes: 3 additions & 0 deletions OpenRobertaServer/staticResources/blockly/msg/json/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@
"ORA_PROGRAM_GET_ONE_SUCCESS" : "Du hast das Programm $ geladen.",
"ORA_PROGRAM_SAVE_SUCCESS" : "Das Programm $ wurde gespeichert.",
"ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB" : "Ein Fehler ist beim Speichern des Programmes aufgetreten.",
"ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS" : "Dieses Programm existiert bereits.",
"ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND" : "Das Programm konnte nicht gefunden werden, ein Update ist unmöglich.",
"ORA_PROGRAM_GET_ALL_SUCCESS" : "Du hast deine Programme geladen.",
"ORA_PROGRAM_DELETE_SUCCESS" : "Du hast das Programm $ gelöscht.",
"ORA_PROGRAM_DELETE_ERROR" : "Ein Fehler ist beim Löschen des Programmes aufgetreten, versuche es nochmal!",
Expand All @@ -767,6 +769,7 @@
"ORA_COMPILERWORKFLOW_ERROR_CONFIGURATION_TRANSFORM_FAILED" : "Die Roboterkonfiguration konnte nicht in die entsprechende Programmiersprache übertragen werden.",
"ORA_COMPILERWORKFLOW_ERROR_PROGRAM_STORE_FAILED" : "Ein Fehler ist beim internen Speichern des Programmes aufgetreten.",
"ORA_COMPILERWORKFLOW_ERROR_PROGRAM_COMPILE_FAILED" : "Das Programm konnte nicht in Maschinensprache übersetzt werden.",
"ORA_COMPILERWORKFLOW_ERROR_PROGRAM_GENERATION_FAILED" : "Das Programm konnte nicht generiert werden.",
"ORA_ROBOT_NOT_WAITING" : "Dein Roboter ist gerade nicht aktiv.",
"ORA_ROBOT_PUSH_RUN" : "Dein Roboter bekommt jetzt dein Programm und startet gleich.",
"ORA_ROBOT_FIRMWAREUPDATE_POSSIBLE" : "Dein Roboter hat nun die aktuellste Version des Betriebssytems.",
Expand Down
5 changes: 3 additions & 2 deletions OpenRobertaServer/staticResources/blockly/msg/json/en.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@metadata": {
"author": "Ellen Spertus <[email protected]>",
"lastupdated": "2015-09-17 19:55:23.128000",
"lastupdated": "2015-09-23 23:53:10.885000",
"locale": "en",
"messagedocumentation" : "qqq"
},
Expand Down Expand Up @@ -773,7 +773,8 @@
"ORA_PROGRAM_GET_ONE_SUCCESS": "Program loaded",
"ORA_PROGRAM_SAVE_SUCCESS": "Program saved",
"ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB": "An error has occured while saving the program.",
"ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND": "An error has occured while updating the program.",
"ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS": "This program already exists.",
"ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND": "The program could not be found, so it is impossible to update it.",
"ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION": "You do not have the permission to modify this program!",
"ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING": "This program is already locked!",
"ORA_PROGRAM_GET_ALL_SUCCESS": "Programs loaded",
Expand Down
3 changes: 2 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/json/qqq.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,8 @@
"ORA_PROGRAM_GET_ONE_SUCCESS": "",
"ORA_PROGRAM_SAVE_SUCCESS": "",
"ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB": "",
"ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND": "",
"ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS": "",
"ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND": "",
"ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION": "",
"ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING": "",
"ORA_PROGRAM_GET_ALL_SUCCESS": "",
Expand Down
4 changes: 3 additions & 1 deletion OpenRobertaServer/staticResources/blockly/msg/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,8 @@ Blockly.Msg.ORA_PROGRAM_GET_ONE_ERROR_NOT_LOGGED_IN = 'You are not logged in, pl
Blockly.Msg.ORA_PROGRAM_GET_ONE_SUCCESS = 'Program loaded';
Blockly.Msg.ORA_PROGRAM_SAVE_SUCCESS = 'Program saved';
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NOT_SAVED_TO_DB = 'An error has occured while saving the program.';
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_PROGRAM_TO_UPDATE_FOUND = 'An error has occured while updating the program.';
Blockly.Msg.ORA_PROGRAM_SAVE_AS_ERROR_PROGRAM_EXISTS = 'This program already exists.';
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_PROGRAM_TO_UPDATE_NOT_FOUND = 'The program could not be found, so it is impossible to update it.';
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_NO_WRITE_PERMISSION = 'You do not have the permission to modify this program!';
Blockly.Msg.ORA_PROGRAM_SAVE_ERROR_OPTIMISTIC_TIMESTAMP_LOCKING = 'This program is already locked!';
Blockly.Msg.ORA_PROGRAM_GET_ALL_SUCCESS = 'Programs loaded';
Expand All @@ -1535,6 +1536,7 @@ Blockly.Msg.ORA_COMPILERWORKFLOW_ERROR_PROGRAM_TRANSFORM_FAILED = "The program c
Blockly.Msg.ORA_COMPILERWORKFLOW_ERROR_CONFIGURATION_TRANSFORM_FAILED = "The robot configuration couldn't be transformed into the robots programming language.";
Blockly.Msg.ORA_COMPILERWORKFLOW_ERROR_PROGRAM_STORE_FAILED = "The program couldn't be saved because of an internal error.";
Blockly.Msg.ORA_COMPILERWORKFLOW_ERROR_PROGRAM_COMPILE_FAILED = "The program couldn't be transformed into machine code.";
Blockly.Msg.ORA_COMPILERWORKFLOW_ERROR_PROGRAM_GENERATION_FAILED = "The program couldn't be generated.";
Blockly.Msg.ORA_ROBOT_NOT_WAITING = "The robot doesn't wait for a run command."
Blockly.Msg.ORA_ROBOT_PUSH_RUN = 'Robot waited and now the jar is pushed to the robot';
Blockly.Msg.ORA_ROBOT_FIRMWAREUPDATE_POSSIBLE = 'The firmware was updated';
Expand Down
Loading

0 comments on commit 9d9a5da

Please sign in to comment.