Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add languages to ll #122

Closed
wants to merge 10 commits into from
Closed

Add languages to ll #122

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc7e604
“add_french_branch“
SusannaShu Jun 5, 2024
df56e1e
merge current and added french
SusannaShu Jun 5, 2024
8353068
Merge branch 'dev' of https://github.com/SusannaShu/Convoscope into dev
SusannaShu Jun 5, 2024
5d8ec08
“add_french_branch“
SusannaShu Jun 9, 2024
a8e1795
“Addressed_PR_feedback“
SusannaShu Jun 17, 2024
27df045
Add languages
SusannaShu Jun 17, 2024
072d469
Update SmartGlassesManager
SusannaShu Jun 17, 2024
48f94c8
Add upgrade agent.py and process.py
SusannaShu Jun 22, 2024
2aed0a5
Address PR feedback
SusannaShu Jun 22, 2024
5361acb
up date to llsg
SusannaShu Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SmartGlassesManager
Open in desktop
Submodule SmartGlassesManager updated 1 files
+3 −1 ...er/src/main/java/com/teamopensmartglasses/smartglassesmanager/speechrecognition/google/SpeechRecGoogle.java
12 changes: 11 additions & 1 deletion android_app/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,22 @@ android {

testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

signingConfigs {
debug {
storeFile file(System.getenv("HOME") + "/.android/debug.keystore")
storePassword "android"
keyAlias "androiddebugkey"
keyPassword "android"
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
debug {
signingConfig signingConfigs.debug
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
4 changes: 2 additions & 2 deletions ...d_app/app/src/main/java/com/teamopensmartglasses/convoscope/convoscopebackend/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ public class Config {
public static final String serverUrl = "https://vpmkebx0cl.execute-api.us-east-2.amazonaws.com/api"; //TOSG BOX
// public static final String serverUrl = "http://192.168.7.117:8080";

public static final Boolean useDevServer = false;
public static final String devServerUrl = "/dev";
public static final Boolean useDevServer = true;
public static final String devServerUrl = "/dev4";
SusannaShu marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions android_app/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<item>Spanish</item>
<item>Hebrew</item>
<item>Dutch</item>
<item>French</item>
<!-- Add more languages here -->
</string-array>

Expand Down
2 changes: 1 addition & 1 deletion server/server_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# Prod:
database_uri = "mongodb://localhost:27017"
server_port = 8080
path_modifier = ""
path_modifier = "/dev4"
SusannaShu marked this conversation as resolved.
Show resolved Hide resolved

# Dev:
#database_uri = "mongodb://localhost:27019"
Expand Down