suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Phrases relations ok (jc)

Browse Source
This commit is contained in:
John Charron 2011-03-16 10:13:13 +01:00
parent 6f4ff1255c
commit 5d6933cac4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/PtiClic/src/org/pticlic/games/BaseGame.java
View File

@ -184,7 +184,7 @@ public class BaseGame extends Activity implements OnClickListener {
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r1.setOnClickListener(this);
rn1.setText(r.getRelationName(game.getCat1()));
rn1.setText(String.format(r.getRelationName(game.getCat1()), ((TextView)findViewById(R.id.mainWord)).getText()));
r1.setImageResource(r.getRelationImage(game.getCat1()));
} catch (Exception e) {
r1.setImageResource(R.drawable.icon);
@ -192,7 +192,7 @@ public class BaseGame extends Activity implements OnClickListener {
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r2.setOnClickListener(this);
rn2.setText(r.getRelationName(game.getCat2()));
rn2.setText(String.format(r.getRelationName(game.getCat2()), ((TextView)findViewById(R.id.mainWord)).getText()));
r2.setImageResource(r.getRelationImage(game.getCat2()));
} catch (Exception e) {
r2.setImageResource(R.drawable.icon);
@ -208,7 +208,7 @@ public class BaseGame extends Activity implements OnClickListener {
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r4.setOnClickListener(this);
rn4.setText(r.getRelationName(game.getCat4()));
rn4.setText(String.format(r.getRelationName(game.getCat4()), ((TextView)findViewById(R.id.mainWord)).getText()));
r4.setImageResource(r.getRelationImage(game.getCat4()));
} catch (Exception e) {
r4.setImageResource(R.drawable.icon);

2
code/PtiClic/src/org/pticlic/model/Relation.java
View File

@ -29,7 +29,7 @@ public class Relation {
// ATTENTION ! Tout ce qui est ci-dessous est en double dans relations.php .
stringRelations = new HashMap<Integer, String>();
stringRelations.put(-1, "Mot non lié au mot central");
stringRelations.put(-1, "Mot non lié à '%s'");
stringRelations.put(0, "'%s' est en rapport avec...");
stringRelations.put(1, "raffinement sémantique");
stringRelations.put(2, "raffinement morphologique");