goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

externalize chat notification strings

pull/53/head
Zlatin Balevsky 2020-10-04 17:41:45 +01:00
parent d0c9594c63
commit d6efd9355e
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
View File

@ -1,5 +1,7 @@
package com.muwire.gui package com.muwire.gui
import static com.muwire.gui.Translator.trans
import griffon.core.artifact.GriffonController import griffon.core.artifact.GriffonController
import griffon.core.controller.ControllerAction import griffon.core.controller.ControllerAction
import griffon.inject.MVCMember import griffon.inject.MVCMember
@ -26,7 +28,6 @@ import com.muwire.core.chat.ChatServer
import com.muwire.core.trust.TrustEvent import com.muwire.core.trust.TrustEvent
import com.muwire.core.trust.TrustLevel import com.muwire.core.trust.TrustLevel
@Log
@ArtifactProviderFor(GriffonController) @ArtifactProviderFor(GriffonController)
class ChatRoomController { class ChatRoomController {
@MVCMember @Nonnull @MVCMember @Nonnull
@ -49,7 +50,7 @@ class ChatRoomController {
} }
if (!command.action.user) { if (!command.action.user) {
JOptionPane.showMessageDialog(null, "$words is not a user command","Invalid Command", JOptionPane.ERROR_MESSAGE) JOptionPane.showMessageDialog(null, trans("NOT_USER_COMMAND",words),trans("INVALID_COMMAND"), JOptionPane.ERROR_MESSAGE)
return return
} }
long now = System.currentTimeMillis() long now = System.currentTimeMillis()
@ -126,7 +127,7 @@ class ChatRoomController {
Persona p = view.getSelectedPersona() Persona p = view.getSelectedPersona()
if (p == null) if (p == null)
return return
String reason = JOptionPane.showInputDialog("Enter reason (optional)") String reason = JOptionPane.showInputDialog(trans("ENTER_REASON_OPTIONAL"))
model.core.eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.TRUSTED, reason : reason)) model.core.eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.TRUSTED, reason : reason))
view.refreshMembersTable() view.refreshMembersTable()
} }
@ -135,7 +136,7 @@ class ChatRoomController {
Persona p = view.getSelectedPersona() Persona p = view.getSelectedPersona()
if (p == null) if (p == null)
return return
String reason = JOptionPane.showInputDialog("Enter reason (optional)") String reason = JOptionPane.showInputDialog(trans("ENTER_REASON_OPTIONAL"))
model.core.eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.DISTRUSTED, reason : reason)) model.core.eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.DISTRUSTED, reason : reason))
view.refreshMembersTable() view.refreshMembersTable()
} }
@ -181,7 +182,6 @@ class ChatRoomController {
try { try {
command = new ChatCommand(e.payload) command = new ChatCommand(e.payload)
} catch (Exception bad) { } catch (Exception bad) {
log.log(Level.WARNING,"bad chat command",bad)
return return
} }
log.info("$model.room processing $command.action") log.info("$model.room processing $command.action")
@ -203,7 +203,7 @@ class ChatRoomController {
} }
private void processJoin(long timestamp, Persona p) { private void processJoin(long timestamp, Persona p) {
String toDisplay = DataHelper.formatTime(timestamp) + " " + p.getHumanReadableName() + " joined the room\n" String toDisplay = DataHelper.formatTime(timestamp) + " " + trans("JOINED_ROOM", p.getHumanReadableName()) + "\n"
runInsideUIAsync { runInsideUIAsync {
model.members.add(p) model.members.add(p)
view.appendGray(toDisplay) view.appendGray(toDisplay)
@ -223,7 +223,7 @@ class ChatRoomController {
} }
private void processLeave(long timestamp, Persona p) { private void processLeave(long timestamp, Persona p) {
String toDisplay = DataHelper.formatTime(timestamp) + " " + p.getHumanReadableName() + " left the room\n" String toDisplay = DataHelper.formatTime(timestamp) + " " + trans("LEFT_ROOM",p.getHumanReadableName()) + "\n"
runInsideUIAsync { runInsideUIAsync {
model.members.remove(p) model.members.remove(p)
view.appendGray(toDisplay) view.appendGray(toDisplay)
@ -233,7 +233,7 @@ class ChatRoomController {
} }
void handleLeave(Persona p) { void handleLeave(Persona p) {
String toDisplay = DataHelper.formatTime(System.currentTimeMillis()) + " " + p.getHumanReadableName() + " disconnected\n" String toDisplay = DataHelper.formatTime(System.currentTimeMillis()) + " " + trans("USER_DISCONNECTED",p.getHumanReadableName()) + "\n"
runInsideUIAsync { runInsideUIAsync {
if (model.members.remove(p)) { if (model.members.remove(p)) {
view.appendGray(toDisplay) view.appendGray(toDisplay)

5
gui/griffon-app/i18n/messages.properties
View File

@ -462,6 +462,11 @@ CONNECTION_STATUS=Connection Status
## Chat room tab ## Chat room tab
SAY_SOMETHING_HERE=Write something here SAY_SOMETHING_HERE=Write something here
START_PRIVATE_CHAT=Start Private Chat START_PRIVATE_CHAT=Start Private Chat
INVALID_COMMAND=Invalid Command
NOT_USER_COMMAND={0} is not a user command
JOINED_ROOM={0} joined the room
LEFT_ROOM={0} left the room
USER_DISCONNECTED={0} disconnected
## Chat monitor ## Chat monitor
CHAT_ROOMS_WITH_MESSAGES=Chat rooms with unread messages CHAT_ROOMS_WITH_MESSAGES=Chat rooms with unread messages