Commit d59fdd1d authored 8 years ago by Richard Alam Committed by GitHub 8 years ago

Merge pull request #3341 from capilkey/add-cc-locale-code

Add property to closed caption transcript model for the locale code

parents 4e48fbe2 1b72f8b0

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 2 additions, 2 deletions

...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/CaptionMessageReceiver.java 2 additions, 2 deletions

...ebutton/core/pubsub/receivers/CaptionMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/recorders/events/EditCaptionHistoryRecordEvent.java 6 additions, 1 deletion

.../core/recorders/events/EditCaptionHistoryRecordEvent.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 4 additions, 4 deletions

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala 1 addition, 0 deletions

...src/main/scala/org/bigbluebutton/core/RecorderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 2 additions, 2 deletions

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 3 additions, 3 deletions

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala 6 additions, 6 deletions

...c/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala 15 additions, 7 deletions

...main/scala/org/bigbluebutton/core/apps/CaptionModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/CaptionMessageToJsonConverter.scala 2 additions, 0 deletions

...n/core/pubsub/senders/CaptionMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java 1 addition, 0 deletions

...ain/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EditCaptionHistoryMessage.java 7 additions, 2 deletions

...bluebutton/common/messages/EditCaptionHistoryMessage.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryReplyMessage.java 1 addition, 1 deletion

...utton/common/messages/SendCaptionHistoryReplyMessage.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UpdateCaptionOwnerMessage.java 7 additions, 2 deletions

...bluebutton/common/messages/UpdateCaptionOwnerMessage.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java 1 addition, 1 deletion

...src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java 4 additions, 2 deletions

...bigbluebutton/red5/client/CaptionClientMessageSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java 6 additions, 6 deletions

.../java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/CaptionService.java 13 additions, 11 deletions

...n/java/org/bigbluebutton/red5/service/CaptionService.java
bigbluebutton-client/src/org/bigbluebutton/modules/caption/events/ReceiveEditCaptionHistoryEvent.as 1 addition, 0 deletions

.../modules/caption/events/ReceiveEditCaptionHistoryEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/caption/events/ReceiveUpdateCaptionOwnerEvent.as 1 addition, 0 deletions

.../modules/caption/events/ReceiveUpdateCaptionOwnerEvent.as

with 85 additions and 52 deletions

Please register or to comment